summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sp-with-simplesign2
-rw-r--r--swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml57
-rw-r--r--swamid-2.0/daisy.ict.kth.se-shibboleth.xml69
-rw-r--r--swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml81
-rw-r--r--swamid-2.0/lms.hig.se-shibboleth-sp.xml93
-rw-r--r--swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml75
-rw-r--r--swamid-2.0/test.bils.se-auth-metadata.xml124
-rw-r--r--swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml79
-rw-r--r--swamid-2.0/urn-urkund-shibboleth-sp.xml8
-rw-r--r--swamid-interfederations-1.0.mxml38
-rw-r--r--swamid-interfederations-1.0/atlases.muni.cz.xml29
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml85
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml79
-rw-r--r--swamid-interfederations-1.0/core.uwap.org.xml56
-rw-r--r--swamid-interfederations-1.0/dev.wiseflow.dk.xml56
-rw-r--r--swamid-interfederations-1.0/foodl.org.xml41
-rw-r--r--swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml38
-rw-r--r--swamid-interfederations-1.0/fse.eduuni.fi.xml91
-rw-r--r--swamid-interfederations-1.0/haka.saimia.fi.xml98
-rw-r--r--swamid-interfederations-1.0/idp.aalto.fi.xml70
-rw-r--r--swamid-interfederations-1.0/idp.abo.fi.xml75
-rw-r--r--swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-1.0/idp.csc.fi.xml88
-rw-r--r--swamid-interfederations-1.0/idp.feide.no.xml9
-rw-r--r--swamid-interfederations-1.0/idp.ids-mannheim.de.xml73
-rw-r--r--swamid-interfederations-1.0/idp.lapinamk.fi.xml74
-rw-r--r--swamid-interfederations-1.0/idp.metropolia.fi.xml107
-rw-r--r--swamid-interfederations-1.0/idp.oamk.fi.xml60
-rw-r--r--swamid-interfederations-1.0/idp.shh.fi.xml70
-rw-r--r--swamid-interfederations-1.0/idp.tut.fi.xml100
-rw-r--r--swamid-interfederations-1.0/idp.uef.fi.xml71
-rw-r--r--swamid-interfederations-1.0/idp.ulapland.fi.xml87
-rw-r--r--swamid-interfederations-1.0/login.helsinki.fi.xml69
-rw-r--r--swamid-interfederations-1.0/logout.uwasa.fi.xml173
-rw-r--r--swamid-interfederations-1.0/moodle.helsinki.fi.xml92
-rw-r--r--swamid-interfederations-1.0/moodle.utu.fi.xml79
-rw-r--r--swamid-interfederations-1.0/openwiki.uninett.no.xml35
-rw-r--r--swamid-interfederations-1.0/portal.clarin.inl.nl.xml93
-rw-r--r--swamid-interfederations-1.0/rr.funet.fi.xml156
-rw-r--r--swamid-interfederations-1.0/shibboleth.bbaw.de.xml74
-rw-r--r--swamid-interfederations-1.0/software.msdnaa.dk.xml34
-rw-r--r--swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml70
-rw-r--r--swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml70
-rw-r--r--swamid-interfederations-1.0/sp.korp.csc.fi.xml89
-rw-r--r--swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml79
-rw-r--r--swamid-interfederations-1.0/sso.utu.fi.xml90
-rw-r--r--swamid-interfederations-1.0/synnefo.sky.deic.dk.xml40
-rw-r--r--swamid-interfederations-1.0/terena.org.xml32
-rw-r--r--swamid-interfederations-1.0/tullbommen.arcada.fi.xml71
-rw-r--r--swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml87
-rw-r--r--swamid-interfederations-1.0/wayf.card.kilroy.eu.xml36
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml1
-rw-r--r--swamid-interfederations-1.0/www.emeraldinsight.com.xml50
-rw-r--r--swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml58
-rw-r--r--swamid-interfederations-2.0.mxml257
-rw-r--r--swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml53
-rw-r--r--swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml81
-rw-r--r--swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/adfs2prod.aventus.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml100
-rw-r--r--swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml63
-rw-r--r--swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml77
-rw-r--r--swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml11
-rw-r--r--swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-metadata.xml (renamed from swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml)83
-rw-r--r--swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml48
-rw-r--r--swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml87
-rw-r--r--swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml114
-rw-r--r--swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml81
-rw-r--r--swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml80
-rw-r--r--swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml72
-rw-r--r--swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml83
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml81
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml83
-rw-r--r--swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml66
-rw-r--r--swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml66
-rw-r--r--swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml61
-rw-r--r--swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml56
-rw-r--r--swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml79
-rw-r--r--swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml (renamed from swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml)83
-rw-r--r--swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/dev.wiseflow.dk.xml56
-rw-r--r--swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml101
-rw-r--r--swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml59
-rw-r--r--swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml6
-rw-r--r--swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml63
-rw-r--r--swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml (renamed from swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml)81
-rw-r--r--swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml68
-rw-r--r--swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml67
-rw-r--r--swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml67
-rw-r--r--swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml199
-rw-r--r--swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml48
-rw-r--r--swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml92
-rw-r--r--swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml63
-rw-r--r--swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml95
-rw-r--r--swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml51
-rw-r--r--swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml95
-rw-r--r--swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml38
-rw-r--r--swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml63
-rw-r--r--swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml56
-rw-r--r--swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml107
-rw-r--r--swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-shibboleth.xml56
-rw-r--r--swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml3
-rw-r--r--swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml4
-rw-r--r--swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml213
-rw-r--r--swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml98
-rw-r--r--swamid-interfederations-2.0/idp.cit.ie-idp.xml2
-rw-r--r--swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml103
-rw-r--r--swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml217
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml8
-rw-r--r--swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml10
-rw-r--r--swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml205
-rw-r--r--swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml103
-rw-r--r--swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml68
-rw-r--r--swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml60
-rw-r--r--swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml113
-rw-r--r--swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml56
-rw-r--r--swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml113
-rw-r--r--swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml160
-rw-r--r--swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml171
-rw-r--r--swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml299
-rw-r--r--swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml227
-rw-r--r--swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml105
-rw-r--r--swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml61
-rw-r--r--swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml140
-rw-r--r--swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml87
-rw-r--r--swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml87
-rw-r--r--swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml87
-rw-r--r--swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml69
-rw-r--r--swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml6
-rw-r--r--swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/login.justis.com.xml9
-rw-r--r--swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml61
-rw-r--r--swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml50
-rw-r--r--swamid-interfederations-2.0/lse.ac.uk-idp.xml104
-rw-r--r--swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml (renamed from swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml)92
-rw-r--r--swamid-interfederations-2.0/lumii-idp.lanet.lv.xml50
-rw-r--r--swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml80
-rw-r--r--swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml5
-rw-r--r--swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml6
-rw-r--r--swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml116
-rw-r--r--swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml60
-rw-r--r--swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml106
-rw-r--r--swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml60
-rw-r--r--swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml68
-rw-r--r--swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml61
-rw-r--r--swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml8
-rw-r--r--swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml79
-rw-r--r--swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml121
-rw-r--r--swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml121
-rw-r--r--swamid-interfederations-2.0/oxford.saasiteu.com-.xml121
-rw-r--r--swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml85
-rw-r--r--swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml (renamed from swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml)84
-rw-r--r--swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml87
-rw-r--r--swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml67
-rw-r--r--swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml59
-rw-r--r--swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml2
-rw-r--r--swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml97
-rw-r--r--swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml63
-rw-r--r--swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml61
-rw-r--r--swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml61
-rw-r--r--swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml60
-rw-r--r--swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml60
-rw-r--r--swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml69
-rw-r--r--swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml14
-rw-r--r--swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml101
-rw-r--r--swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml138
-rw-r--r--swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml185
-rw-r--r--swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml115
-rw-r--r--swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml (renamed from swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml)80
-rw-r--r--swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml78
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml72
-rw-r--r--swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/shibboleth.ebscohost.com.xml47
-rw-r--r--swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml68
-rw-r--r--swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml174
-rw-r--r--swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml9
-rw-r--r--swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml65
-rw-r--r--swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml156
-rw-r--r--swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml66
-rw-r--r--swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml97
-rw-r--r--swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml73
-rw-r--r--swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml103
-rw-r--r--swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml101
-rw-r--r--swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml69
-rw-r--r--swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml4
-rw-r--r--swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml90
-rw-r--r--swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml105
-rw-r--r--swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml93
-rw-r--r--swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml65
-rw-r--r--swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml10
-rw-r--r--swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml35
-rw-r--r--swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml71
-rw-r--r--swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml67
-rw-r--r--swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml83
-rw-r--r--swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml79
-rw-r--r--swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml63
-rw-r--r--swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml46
-rw-r--r--swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml46
-rw-r--r--swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml91
-rw-r--r--swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml79
-rw-r--r--swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml65
-rw-r--r--swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml65
-rw-r--r--swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml12
-rw-r--r--swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml79
-rw-r--r--swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml97
-rw-r--r--swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml1
-rw-r--r--swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml87
-rw-r--r--swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml63
-rw-r--r--swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml2
-rw-r--r--swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml99
-rw-r--r--swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/www.klarro.net-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml58
-rw-r--r--swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml83
-rw-r--r--swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/www.qoam.eu-.xml67
-rw-r--r--swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml62
-rw-r--r--swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml85
-rw-r--r--swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml117
-rw-r--r--swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml77
-rw-r--r--swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml85
-rw-r--r--swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml31
-rw-r--r--swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml47
-rw-r--r--swamid-sp-2.0.mxml7
384 files changed, 4172 insertions, 23610 deletions
diff --git a/sp-with-simplesign b/sp-with-simplesign
index 28a54595..4b99548e 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -27,7 +27,6 @@ cambro-test-26.umdc.umu.se-shibboleth.xml
cambro-tst1.umdc.umu.se-shibboleth.xml
cambro-utv1.umdc.umu.se-shibboleth.xml
captivelan-test.it.su.se-shibboleth.sso.xml
-captivelan.it.su.se-shibboleth.sso.xml
cas.weblogin.uu.se-cas.xml
cdn.nordunet.tv-shibboleth.xml
ci.nordu.net-shibboleth.xml
@@ -224,7 +223,6 @@ sp.it.gu.se-shibboleth.xml
sp.kau.se-shibboleth.xml
sp.swamid.se-shibboleth.xml
sp.tools.sunet.se-shibboleth.xml
-sp.wavelan.su.se-shibboleth.sso.xml
su.avedas.com-shibboleth.xml
sutest.dsv.su.se-shibboleth.xml
swamid.shh.se-idp-shibboleth.xml
diff --git a/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml b/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 63bc6c1b..00000000
--- a/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://captivelan.it.su.se/Shibboleth.sso">
- <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://captivelan.it.su.se/Shibboleth.sso/WAYF"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF" index="1"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/SWAMID"/>
- <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://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan-test"/>
- <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://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan-test" index="3"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>captivelan-prod-carp1.it.su.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=captivelan-prod-carp1.it.su.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAOj7uHDYhhhAMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHmNhcHRpdmVsYW4tcHJvZC1jYXJwMS5pdC5zdS5zZTAeFw0xMjA4MTYwNjQ3
-MDlaFw0yMjA4MTQwNjQ3MDlaMCkxJzAlBgNVBAMTHmNhcHRpdmVsYW4tcHJvZC1j
-YXJwMS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMzx
-w+bemmxOUna+e8r3EYf8K/lhbRqnIpvHBtCvQ8Hs9NPbeBdQU146UwEGGSm9eBsR
-OEekCXgjudorIvjt8O/wxmjCNmHzj/2qP+Adbj/0t7tY+Fq+SXZAvQHGnxX9yDbr
-opA8ge9pDhglakg/2L9qAS2ud0YH4tv43qL/60CVDBOrMmRNDWqqxYwB3scCiz9+
-R+dlbACube/4NWPma5oaezMwEQy0snBD8IgeEdvpp/l62RcrcI+7SWUNs6isgG0o
-9+TyRYBpmpcbG6Y+xhjWfYRN10XGXngNJ5VLcWnuJ35ryhQgKlviU4PJl7421Glw
-w3Uwk7f9w4Zy3UZ2lKUCAwEAAaNMMEowKQYDVR0RBCIwIIIeY2FwdGl2ZWxhbi1w
-cm9kLWNhcnAxLml0LnN1LnNlMB0GA1UdDgQWBBRj066uDCEkGZj71jtrxJ0RJvEt
-IDANBgkqhkiG9w0BAQUFAAOCAQEAcx8+oqL6kN2Fbl29VdMFOy2as/5porQVoHC8
-rkwQT86kuunaY5QaMSeo+NJ7RbwN8PGLP0syrrdhb9WdWOClD00ZEf0AqiPHJeQQ
-PLCoyyOQYarfWC2dSEZ8gbvJpU2nu3GZ1g5tf5rN6UWtzeTxtIRav6OiTuoojM0C
-qsBAyUcnBfNjtpa3swU7Vfd4MAOqyPqZHm/512/RSW+hYpOjMNcp1RkOy7ne1GK/
-mcsQPmRHkRImnweyygzpYMQ+1uLdEdi0wbmVQpMcSlrQ4Dt558PfmXAIrvXwd3of
-ROU2a0niXfGVaIomY/J7Xkazao4dQmFvwHY77hTp6Qhf3PlYOw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/daisy.ict.kth.se-shibboleth.xml b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
new file mode 100644
index 00000000..1496fb03
--- /dev/null
+++ b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://daisy.ict.kth.se/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor 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://daisy.ict.kth.se/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://daisy.ict.kth.se/Shibboleth.sso/Login/SU"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/DSV"/>
+ <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://daisy.ict.kth.se/Shibboleth.sso/DS/DSV" 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://daisy.ict.kth.se/Shibboleth.sso/DS/SU"/>
+ <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://daisy.ict.kth.se/Shibboleth.sso/DS/SU" 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://daisy.ict.kth.se/Shibboleth.sso/DS/SWAMID"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/SWAMID" index="3"/>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Daisy</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Daisy</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Studieadministrativt system för data- och systemvetenskap vid Stockholms universitet och ICT-skolan vid KTH.</mdui:Description>
+ <mdui:Description xml:lang="en">Administrative system for education used by the Department of Computer and Systems Sciences (DSV) at Stockholm University and the School of Information and Communication Technology (ICT) at KTH.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>daisy.dsv.su.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=daisy.dsv.su.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANH4LV/rSc9DMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2RhaXN5LmRzdi5zdS5zZTAeFw0xNDA5MDIxMTM0MzdaFw0yNDA4MzAxMTM0
+MzdaMBoxGDAWBgNVBAMTD2RhaXN5LmRzdi5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMYxuWKcPXDRuanmNtBs0LlEdh8z5Dx/x1w6ZxmlfI7n
+Ed8pZbNwQXh8Ve8oa+zE5h5ucUQaH4IXn/dggbhnX6YbtI6uY5nti7gcFCivDxJ0
+5QM4BkRJlpCDX9neSehXJD/qXEhClSVMbr97nW0tG9MZcQf/PpnMqpfEOFTdzewX
+0JrNTUQWqseTYgJ4FIyjXL1juz6UwmBI+0Dmm7qQbg9dqqTLE9eImUPgATr+HIeY
+RPhIMFAyDxHDTsRaots8zx8KqjEUxmpI1dwCflPEJRxTe1dy+o/A00qUKrBWNdVN
+V0jahE0vSuHnpxskB5f9ZcMiUgwf84/qyKTGefoiomkCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPZGFpc3kuZHN2LnN1LnNlMB0GA1UdDgQWBBS9Ss3+oqLHzza+tYncMvHI
+DfBVUzANBgkqhkiG9w0BAQUFAAOCAQEAHSqZjB17aP2sDkSEfqSbui2yMXwPcZSW
+2kKR6hZv1r7HnHDoGJYRmj7/qjVnaWJxSwZkeUvDykZpl1Vn42Ik0UgtipZ245Si
+SHhrmDQo9lpms1YwVFyHXamSU/6zbG0W/sTpcM5FB3hqUgWOLkO+bRutZZKE8T9N
++T0zv7S1FTWBttLA6iYOd/ODVe+Px2UMbadlk4iGZHZUI/4T4aRcNUInNhEdYXDK
+AA4QdpJkL9NWpra1nc5H/Z+Xs+KwciCDhmuu+QGwuynKuoJwSxRnlsGBar9K/5ra
+QhkStwIG6VXQAVJpMKGblsSIk+TqRD1okkUSY5BHAob80RAoOCmbhw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..dfb91799
--- /dev/null
+++ b/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gih.pingpong.se/Shibboleth.sso/Metadata">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv"> PING PONG vid GIH </mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en"> PING PONG at GIH </mdui:DisplayName>
+ <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan. </mdui:Description>
+ <mdui:Description xml:lang="en"> The learning platform PING PONG at The Swedish School of Sport and Health Sciences. </mdui:Description>
+ <mdui:Logo height="168" width="50">https://gih.pingpong.se/login/pingpong-logo-168x50.png </mdui:Logo>
+ <mdui:Logo height="16" width="16">https://gih.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gih.pingpong.se/Shibboleth.sso/Login"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://lillaedet.pingpong.se/shibboleth</ds:KeyName>
+ <ds:KeyName>lillaedet.pingpong.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=lillaedet.pingpong.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMNpqZY0cUukMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTAeFw0xMjAxMTgxMDU4MjZaFw0yMjAx
+MTUxMDU4MjZaMCAxHjAcBgNVBAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8GQM1LnsvyXPnZh9ZlWhG3gkJB
+0H8I7kkVO017B7AmQvFingsCaIHBFnglKRyTml5lw5My4NGi9QVWLSd5IIoDD9Is
+uRR5tEU0+G6eyxQy08MZMB0XwamC+8BsU/0rOc5zmA+iAS3LDZO4m+gLOwWYorbg
+a6ViHplIrOUOBeUT1j4D3MJs5LBpJ/Ruvf4sAzP/eA8uCr7Wo13Geq+8lJodV917
+D+/KbGbOHZMkhCb9iCZpdJVvnVGWWuQbYMfAxaRcGkIMKZOcFiseCJ1tUlrb9YFD
+WuPcF7kFr0nzGmqVyqFd7zedMNzIEyBVlEa3YwcwxQSlopVf9FBm5FNGi88CAwEA
+AaNtMGswSgYDVR0RBEMwQYIVbGlsbGFlZGV0LnBpbmdwb25nLnNlhihodHRwczov
+L2xpbGxhZWRldC5waW5ncG9uZy5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQS1rOl
+mFqPheIlLCkc2f6dkjPjGDANBgkqhkiG9w0BAQUFAAOCAQEAYJ+J6GqQXCjnDI4j
+jeT1SSEpDmEgH4JtaJbth2Ymz1lw8DAwF51aXK+9ylY239V2tQ7cVYdYdeNLsK8S
+i8WGFEPepAJevRES3TbZmBkx63vg6KFtONBFa4FiDAHv7Ja7fGPC/jo4+7V+174j
+wdfS6g4c1YW8xMNOHgdAbeMVk365DD3vYv796T6m9oaZfp41fOkvQ2Ly7lD1P53d
+kYPtN92O/M+IGG8b3FF4UQ3tTnC8N9D6YF18X5GK+W1tSQfZ7jAf3sAK9yrXuZv2
+AyhVkxRiEnLD4tvVDNFseCCzGAomlzCuOU2QY5TyK6VbtwKvxZvUc6GQF5y7h1aN
+UIZtDw==
+</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://gih.pingpong.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gih.pingpong.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lms.hig.se-shibboleth-sp.xml b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
new file mode 100644
index 00000000..0eb10cb4
--- /dev/null
+++ b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lms.hig.se/shibboleth-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Blackboard (Learning Management System)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Blackboard lärplattform</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning. </mdui:Description>
+ <mdui:Description xml:lang="sv">Blackboard är ett webbaserat system för hantering av kurser vid Högskolan i Gävle, en så kallad lärplattform. Systemet kan användas för både campus- och distanskurser.</mdui:Description>
+ <mdui:Logo height="45" width="50">https://webkonto.student.hig.se/img/cencolor-50.gif</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="44" width="50">https://webkonto.student.hig.se/img/cenfarg-50.gif</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.blackboard.com/Footer/Privacy-Center.aspx</mdui:PrivacyStatementURL>
+ </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://lms.hig.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lms.hig.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>fgprd-137892-sf108273-app001</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=fgprd-137892-sf108273-app001</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAJjJj09+G/e9MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGZncHJkLTEzNzg5Mi1zZjEwODI3My1hcHAwMDEwHhcNMTUwNDIwMTYwMzE3
+WhcNMjUwNDE3MTYwMzE3WjAnMSUwIwYDVQQDExxmZ3ByZC0xMzc4OTItc2YxMDgy
+NzMtYXBwMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCKelXjL
+3oStYmCPuLadSQ9VoUVsoUDVvG/KZMyqGffZFnecykjIR98UrmfP0HyTVSJKrTyZ
+oRMKgs+lLFFO6VXlBz8psHBjLbF/ZUk3Vz361iU1eWK9TZ2I0zQT+DEYqGY2iYGf
+QDM3tpzuuqm9cez/XlGINZK5Yxzt31+JirDTx5BwGgkTqNl34WO4LWcGSybMrIcM
+1kHqQ1j2vWe5/1QBVskIABEtZK3m798XcLAaGPvyFxl9iO9aBbpXGIyR9F0t2row
+lPAsEXkJ1pli/aLSq2EaGdXd+jHm9avhzvqqd1EgB8W4rbk99znNhOAOR8tBV8G5
+pC4gPZFmXTNi4wIDAQABo0owSDAnBgNVHREEIDAeghxmZ3ByZC0xMzc4OTItc2Yx
+MDgyNzMtYXBwMDAxMB0GA1UdDgQWBBT97eKp2I/NaaU7VpgTGmVhNQTsmDANBgkq
+hkiG9w0BAQUFAAOCAQEAPzOmg2K4XVoCrfGgaLk911O0Ok0aIs99HdBZ00Z1/7Qo
+qSZhZwas6HZdxkx2KA/RLztfbE71V33RVYlOhtH47lGLCvaEd5bsrrDeVnXsxPVS
+Nzdp17br+kLxyTqwSG2rvMVwHjFuDBS1Ar/Admm+k5Szj6UfuPBBIXDw8F33GwOT
+hzAuvpNmZKE5MpDOE97gtvAKAfPzL/St1off5DiCc1fC/AIYusUtcxh9hGdIZ5X8
+Lk4WW3xh7ISn0oT7Dd4ySiBaxYc1XWalRa082HDRHKW0xHZC+yywn+yiloN+t3sj
+Xiuyn7D35GBAgkGy+kU+hqB2fHQUrvnx3tn6wfL7BA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lms.hig.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lms.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lms.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SAML2/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lms.hig.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lms.hig.se/Shibboleth.sso/SAML/POST" index="11"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lms.hig.se/Shibboleth.sso/SAML/Artifact" index="12"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
deleted file mode 100644
index f067f0d1..00000000
--- a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.wavelan.su.se/Shibboleth.sso">
- <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>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF" index="1"/>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
-MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
-x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
-pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
-Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
-oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
-P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
-8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
-AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
-B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
-oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
-mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
-xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
-m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
-MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
-x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
-pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
-Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
-oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
-P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
-8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
-AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
-B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
-oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
-mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
-xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
-m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.bils.se-auth-metadata.xml b/swamid-2.0/test.bils.se-auth-metadata.xml
index c26c492c..512c52a9 100644
--- a/swamid-2.0/test.bils.se-auth-metadata.xml
+++ b/swamid-2.0/test.bils.se-auth-metadata.xml
@@ -1,29 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.bils.se/auth/metadata/">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
<md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">BILS</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Bioinformatics Infrastructure for Life Sciences</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://test.bils.se/auth/info</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDgDCCAmgCCQC/bFOq5e+52jANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMC
- U0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExDTALBgNVBAoM
- BEJJTFMxDDAKBgNVBAsMA2RldjEVMBMGA1UEAwwMdGVzdC5iaWxzLnNlMRowGAYJ
- KoZIhvcNAQkBFgtkYXpAYmlscy5zZTAeFw0xNTA2MjIxMjUxMDFaFw0xNjA2MjEx
- MjUxMDFaMIGBMQswCQYDVQQGEwJTRTEQMA4GA1UECAwHVXBwc2FsYTEQMA4GA1UE
- BwwHVXBwc2FsYTENMAsGA1UECgwEQklMUzEMMAoGA1UECwwDZGV2MRUwEwYDVQQD
- DAx0ZXN0LmJpbHMuc2UxGjAYBgkqhkiG9w0BCQEWC2RhekBiaWxzLnNlMIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwPObDk1tkLQxu15k9c
- M7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADnSQj01p2wGbse0RP+
- 17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN30alF8n98jACPs2nD
- CmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkORw/vMoxqeWF1GTPy
- m6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQkzSSI58+Yp+raucIp
- rZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zLkSB3yDE8EwIDAQAB
- MA0GCSqGSIb3DQEBCwUAA4IBAQA9IxuGftj1HKmeR20qaEIuf/r0sdPy+TMSvq7x
- DFpE9pJpO7amzqDlBX+kZAPI0zR6FlGAuZPttdVUcV/rM9Er7wkvPgOD6tmelblk
- c02RHODAwz9H9zrUXTJ+JLd5fDcDtO2tIBtsrJW6GenOL/f/6/xhfnjraUyBsJrx
- dIXyTPFy3AvcXGRlmerQgAK76f7cA5yTYdZewqmL2GmMagfgOBr3r2IFGv96OniP
- RzJDSRB4WW8TL1u7LpPn2UjaQ0jFGM9/bxC6jS1TIqgbbmCNUAQ7YVh0/g3cOf7d
- g0diYVdCWk0ZP3QvFBBu7QZEC4GheezEur/bQq+zfc2FKvkq
+ MIIFGzCCBAOgAwIBAgIQCg6hqtuYkZ55b+FL/H496TANBgkqhkiG9w0BAQsFADBk
+ MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+ Q0EgMzAeFw0xNTA3MDcwMDAwMDBaFw0xODA3MTExMjAwMDBaMHAxCzAJBgNVBAYT
+ AlNFMRUwEwYDVQQIEwxPc3RlcmdvdGxhbmQxEjAQBgNVBAcTCUxpbmtvcGluZzEf
+ MB0GA1UEChMWTGlua29waW5ncyB1bml2ZXJzaXRldDEVMBMGA1UEAxMMdGVzdC5i
+ aWxzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwP
+ ObDk1tkLQxu15k9cM7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADn
+ SQj01p2wGbse0RP+17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN3
+ 0alF8n98jACPs2nDCmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkO
+ Rw/vMoxqeWF1GTPym6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQk
+ zSSI58+Yp+raucIprZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zL
+ kSB3yDE8EwIDAQABo4IBuzCCAbcwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lR
+ EWN1UGIwHQYDVR0OBBYEFC/USBcPGwl3iEiryB40P5EDYi5PMBcGA1UdEQQQMA6C
+ DHRlc3QuYmlscy5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+ AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
+ ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
+ Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwB
+ ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4G
+ CCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
+ Y29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVS
+ RU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBz
+ 3a9V9W+zKmPWPkNr39TFgyyhKdaDQbnFUVi2obSY+vr5abAiY1UDRXfSpx0sk4I3
+ EDMBXK/Bja4ok2EMNKzGAAHA9Lj4LlvMl8kxz6fM8VO00yr5dycScKyvKHjI6VAj
+ 0CuEXlaoMYk3dJjAI6bZn44MB9C2aFxcjqhcKy7Ip7CWNT+LbhzAGg07hV7H7Y0e
+ Bd3gaTdt56dyFXxPCF1JSs1yUlTT4dhgRHzTmwDpznNxvKrrFHxdrF5Sfpb2R7Ng
+ gj6Lg0196OgB9H3vHKCHKfcYFQxl0rqGrAOg6UPn6kRFRXY42Qk+6Bvf0j94bcA/
+ uaWJuMqFL2/ea0WzYmcZ
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -32,44 +57,49 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDgDCCAmgCCQC/bFOq5e+52jANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMC
- U0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExDTALBgNVBAoM
- BEJJTFMxDDAKBgNVBAsMA2RldjEVMBMGA1UEAwwMdGVzdC5iaWxzLnNlMRowGAYJ
- KoZIhvcNAQkBFgtkYXpAYmlscy5zZTAeFw0xNTA2MjIxMjUxMDFaFw0xNjA2MjEx
- MjUxMDFaMIGBMQswCQYDVQQGEwJTRTEQMA4GA1UECAwHVXBwc2FsYTEQMA4GA1UE
- BwwHVXBwc2FsYTENMAsGA1UECgwEQklMUzEMMAoGA1UECwwDZGV2MRUwEwYDVQQD
- DAx0ZXN0LmJpbHMuc2UxGjAYBgkqhkiG9w0BCQEWC2RhekBiaWxzLnNlMIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwPObDk1tkLQxu15k9c
- M7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADnSQj01p2wGbse0RP+
- 17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN30alF8n98jACPs2nD
- CmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkORw/vMoxqeWF1GTPy
- m6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQkzSSI58+Yp+raucIp
- rZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zLkSB3yDE8EwIDAQAB
- MA0GCSqGSIb3DQEBCwUAA4IBAQA9IxuGftj1HKmeR20qaEIuf/r0sdPy+TMSvq7x
- DFpE9pJpO7amzqDlBX+kZAPI0zR6FlGAuZPttdVUcV/rM9Er7wkvPgOD6tmelblk
- c02RHODAwz9H9zrUXTJ+JLd5fDcDtO2tIBtsrJW6GenOL/f/6/xhfnjraUyBsJrx
- dIXyTPFy3AvcXGRlmerQgAK76f7cA5yTYdZewqmL2GmMagfgOBr3r2IFGv96OniP
- RzJDSRB4WW8TL1u7LpPn2UjaQ0jFGM9/bxC6jS1TIqgbbmCNUAQ7YVh0/g3cOf7d
- g0diYVdCWk0ZP3QvFBBu7QZEC4GheezEur/bQq+zfc2FKvkq
+ MIIFGzCCBAOgAwIBAgIQCg6hqtuYkZ55b+FL/H496TANBgkqhkiG9w0BAQsFADBk
+ MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+ Q0EgMzAeFw0xNTA3MDcwMDAwMDBaFw0xODA3MTExMjAwMDBaMHAxCzAJBgNVBAYT
+ AlNFMRUwEwYDVQQIEwxPc3RlcmdvdGxhbmQxEjAQBgNVBAcTCUxpbmtvcGluZzEf
+ MB0GA1UEChMWTGlua29waW5ncyB1bml2ZXJzaXRldDEVMBMGA1UEAxMMdGVzdC5i
+ aWxzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwP
+ ObDk1tkLQxu15k9cM7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADn
+ SQj01p2wGbse0RP+17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN3
+ 0alF8n98jACPs2nDCmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkO
+ Rw/vMoxqeWF1GTPym6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQk
+ zSSI58+Yp+raucIprZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zL
+ kSB3yDE8EwIDAQABo4IBuzCCAbcwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lR
+ EWN1UGIwHQYDVR0OBBYEFC/USBcPGwl3iEiryB40P5EDYi5PMBcGA1UdEQQQMA6C
+ DHRlc3QuYmlscy5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+ AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
+ ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
+ Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwB
+ ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4G
+ CCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
+ Y29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVS
+ RU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBz
+ 3a9V9W+zKmPWPkNr39TFgyyhKdaDQbnFUVi2obSY+vr5abAiY1UDRXfSpx0sk4I3
+ EDMBXK/Bja4ok2EMNKzGAAHA9Lj4LlvMl8kxz6fM8VO00yr5dycScKyvKHjI6VAj
+ 0CuEXlaoMYk3dJjAI6bZn44MB9C2aFxcjqhcKy7Ip7CWNT+LbhzAGg07hV7H7Y0e
+ Bd3gaTdt56dyFXxPCF1JSs1yUlTT4dhgRHzTmwDpznNxvKrrFHxdrF5Sfpb2R7Ng
+ gj6Lg0196OgB9H3vHKCHKfcYFQxl0rqGrAOg6UPn6kRFRXY42Qk+6Bvf0j94bcA/
+ uaWJuMqFL2/ea0WzYmcZ
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.bils.se/auth/logout"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.bils.se/auth/response" index="1"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">BILS Registration</md:ServiceName>
- <md:ServiceName xml:lang="sv">BILS Inloggning</md:ServiceName>
- <md:RequestedAttribute Name="first_name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute Name="last_name" 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="false"/>
- <md:RequestedAttribute FriendlyName="email" Name="urn:oid:1.2.840.113549.1.9.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- </md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.bils.se/</md:OrganizationURL>
</md:Organization>
- <md:ContactPerson contactType="technical"/>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Frédéric</md:GivenName>
+ <md:SurName>Haziza</md:SurName>
+ <md:EmailAddress>daz@bils.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..f1077ee4
--- /dev/null
+++ b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testgih.pingpong.net/Shibboleth.sso/Metadata">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">TEST-PING PONG vid GIH</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">TEST-PING PONG at GIH</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">test: Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan.</mdui:Description>
+ <mdui:Description xml:lang="en">test: The learning platform PING PONG at The Swedish School of Sport and Health Sciences.</mdui:Description>
+ <mdui:Logo height="168" width="50">https://testgih.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://testgih.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testgih.pingpong.net/Shibboleth.sso/Login"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>krusbar.pingpong.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=krusbar.pingpong.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMVvfL7J0nz+MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGtydXNiYXIucGluZ3BvbmcubmV0MB4XDTEyMDYyODE1MDYzMFoXDTIyMDYy
+NjE1MDYzMFowHzEdMBsGA1UEAxMUa3J1c2Jhci5waW5ncG9uZy5uZXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvh+Jg4oen/vUUGtx9eAaYY5rXtTFl
+1nMfq5x3XghdSV8uPg4bQ6VXw/9fZVTnAO3iFrF1LrfjuZWhZN2iL40nXfM1isSR
+mDZDF7CgqwsnoaVodgS/OyL9Q9iGOaXrM2lrN4ucuFAZcd3MUIrZjyBp3jtWkuTp
+T1VHnicxVWbT8VsjrWAdj1MUFv2IeWPP1it+4dwUDZrLqKhRWnFAo8zGHXiyO+aw
+U1Qb/52EShNykDHWBbtzgadLhPQzWQy5E457wvNVFbad0cc29vASufbIhzBGE/U3
+DdVI6jphpn5QMZfHhl9BLoqr9MJh1F1BRlL+HOcLXbQqg0JD/d1d7XAjAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGtydXNiYXIucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQd
+qBIVHafXKIz/Jr3tdLtcKbzR8zANBgkqhkiG9w0BAQUFAAOCAQEAKYOuyj800ABK
+R99elNxsDEddcjmIJQbO5tAosETGVlyqqdWL2D1rtSw0CTQiaba5Ae/TcgR/fnOv
+1g3uBZA26iQPbzsKGKYsB21aUEPJO0ZVhTdcid1tS672fOIZf1Y8+hmNh1psAurp
+DNOpoBNLoM8S8P95Q7hM6xLM76D1R61q4kO3np/YLYwNQSsHnHddu8/9oJu5j7oV
+KGPGrSczPfxG4plIUxm5tzNkHqNyYQttKrXGqdtCdkwjtYxS48G/ba1XkR/+baMf
+D8OuFV1n1oNCM9fqRzlCOyA7ISZyMlfiMCP3HXs53AcrRAnUKYwkP6Q4dIPS3C4Y
+LaCAPwuThQ==
+</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://testgih.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml
index 9db7884b..9407e844 100644
--- a/swamid-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml
@@ -12,6 +12,14 @@
<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>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Detect and check for plagiarism with URKUND</mdui:Description>
+ <mdui:Description xml:lang="en">Detect and check for plagiarism with URKUND</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.urkund.com</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.urkund.com</mdui:InformationURL>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index ca347eed..be075c18 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -2,10 +2,8 @@
<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-1.0.xml">
<xi:include href="swamid-interfederations-1.0/agw-sparknet.utu.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/atlases.muni.cz.xml"/>
<xi:include href="swamid-interfederations-1.0/auth.asiaportal.info.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
@@ -26,6 +24,7 @@
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml"/>
@@ -63,97 +62,62 @@
<xi:include href="swamid-interfederations-1.0/clarin.phonetik.uni-muenchen.de.xml"/>
<xi:include href="swamid-interfederations-1.0/compute.deic.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/core.uwap.org.xml"/>
<xi:include href="swamid-interfederations-1.0/data.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-1.0/dev.wiseflow.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/europe-stage.wiseflow.net.xml"/>
<xi:include href="swamid-interfederations-1.0/europe.wiseflow.net.xml"/>
<xi:include href="swamid-interfederations-1.0/filesender.funet.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
-<xi:include href="swamid-interfederations-1.0/foodl.org.xml"/>
<xi:include href="swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-1.0/fse.eduuni.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/haka.saimia.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.aalto.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.abo.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.feide.no.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.ids-mannheim.de.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.metropolia.fi-idp.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.metropolia.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.oamk.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.shh.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.tut.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.uef.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.ulapland.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/infra.clarin.dk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/login.helsinki.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/logout.uwasa.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-1.0/moodle.utu.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/openwiki.uninett.no.xml"/>
<xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl-.xml"/>
-<xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl.xml"/>
<xi:include href="swamid-interfederations-1.0/repos.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml"/>
-<xi:include href="swamid-interfederations-1.0/rr.funet.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/secure.huygens.knaw.nl.xml"/>
<xi:include href="swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/shibboleth.bbaw.de.xml"/>
<xi:include href="swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/software.msdnaa.dk-.xml"/>
-<xi:include href="swamid-interfederations-1.0/software.msdnaa.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.catalog.clarin.eu.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.clarin.si-.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi-.xml"/>
-<xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.lat.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.lux17.mpi.nl.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.vs1.corpora.uni-hamburg.de.xml"/>
<xi:include href="swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml"/>
-<xi:include href="swamid-interfederations-1.0/sso.utu.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
-<xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/terena.org-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/terena.org.xml"/>
<xi:include href="swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml"/>
-<xi:include href="swamid-interfederations-1.0/tullbommen.arcada.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml"/>
<xi:include href="swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.ordbogen.com.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.wayf.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/weblicht.sfs.uni-tuebingen.de.xml"/>
<xi:include href="swamid-interfederations-1.0/wiseflow.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/www.clarin-pl.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com.xml"/>
<xi:include href="swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
<xi:include href="swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/www.ordbogen.com.xml"/>
diff --git a/swamid-interfederations-1.0/atlases.muni.cz.xml b/swamid-interfederations-1.0/atlases.muni.cz.xml
deleted file mode 100644
index a385fe38..00000000
--- a/swamid-interfederations-1.0/atlases.muni.cz.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://atlases.muni.cz/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/POST"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Pathology Images</md:ServiceName>
- <md:ServiceName xml:lang="da">Patologi-atlasser</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to provide access to the three atlases: (1) Dermatopathology, (2) Fetal and Neonatal Pathology, (3) Pathology for Pre-graduate Students of Medicine. The atlases may serve as sources of teaching material for pre-graduate as well as postgraduate students of pathology</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: (1) Dermato-patologi, (2) Foster- og neonatal patologi, (3) Patologi for medicinstuderende. Atlasserne kan bruges som undervisningsmateriale for patologistuderende</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml
deleted file mode 100644
index c59e54c5..00000000
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/adfs.smk.dk/FederationMetadata/2007-06/FederationMetadata.xml ">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-19T13:49:56Z" registrationAuthority="https://www.wayf.dk">
- <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
- <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
- <mdui:DisplayName xml:lang="da">Statens Museum for Kunst</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">National Gallery of Denmark</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDFjCCAf4CAQcwDQYJKoZIhvcNAQELBQAwUTFPME0GA1UEAwxGaHR0cHM6Ly9h
-ZGZzLnNtay5kay9GZWRlcmF0aW9uTWV0YWRhdGEvMjAwNy0wNi9GZWRlcmF0aW9u
-TWV0YWRhdGEueG1sIDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMFEx
-TzBNBgNVBAMMRmh0dHBzOi8vYWRmcy5zbWsuZGsvRmVkZXJhdGlvbk1ldGFkYXRh
-LzIwMDctMDYvRmVkZXJhdGlvbk1ldGFkYXRhLnhtbCAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAJIFoBPrQfa+h0nbOIcTuGJq1ribQKKtQaCdPYgOFm9YPNNhO5QO
-Z8+W57Jtz9pkVhzcn6LiE4+L5dK+ZC5ERRAGPnMHJOHzC2Ues2bi+uzZbhOHpBAU
-9um7PY3kDH96TGn4zfeG1QMi+erpUOeOlJ58FfWYbrqqlTvRirN6wNW+sJvPm/sz
-s+vN/UXD2qRL55Z6vG06sfvE9O0V4I/9X7001REowDiD6qlU/bZForXE5jw8aOjT
-ta8K6Ot5J2B3eqkFoBhhK/aNJczdTfWgGc6Bru5/0TboE4Rvfy1GmpS7wROlK9bj
-APsEZFBbmAlLIvm0bNHqB/h1FTcRpOQxgMU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDFjCCAf4CAQcwDQYJKoZIhvcNAQELBQAwUTFPME0GA1UEAwxGaHR0cHM6Ly9h
-ZGZzLnNtay5kay9GZWRlcmF0aW9uTWV0YWRhdGEvMjAwNy0wNi9GZWRlcmF0aW9u
-TWV0YWRhdGEueG1sIDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMFEx
-TzBNBgNVBAMMRmh0dHBzOi8vYWRmcy5zbWsuZGsvRmVkZXJhdGlvbk1ldGFkYXRh
-LzIwMDctMDYvRmVkZXJhdGlvbk1ldGFkYXRhLnhtbCAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAJIFoBPrQfa+h0nbOIcTuGJq1ribQKKtQaCdPYgOFm9YPNNhO5QO
-Z8+W57Jtz9pkVhzcn6LiE4+L5dK+ZC5ERRAGPnMHJOHzC2Ues2bi+uzZbhOHpBAU
-9um7PY3kDH96TGn4zfeG1QMi+erpUOeOlJ58FfWYbrqqlTvRirN6wNW+sJvPm/sz
-s+vN/UXD2qRL55Z6vG06sfvE9O0V4I/9X7001REowDiD6qlU/bZForXE5jw8aOjT
-ta8K6Ot5J2B3eqkFoBhhK/aNJczdTfWgGc6Bru5/0TboE4Rvfy1GmpS7wROlK9bj
-APsEZFBbmAlLIvm0bNHqB/h1FTcRpOQxgMU=
-</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/adfs.smk.dk/adfs/ls/"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="da">Statens Museum for Kunst</md:OrganizationName>
- <md:OrganizationName xml:lang="en">National Gallery of Denmark</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">Statens Museum for Kunst</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">National Gallery of Denmark</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="da">http://www.smk.dk</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.smk.dk/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Axel</md:GivenName>
- <md:SurName>Kellermann</md:SurName>
- <md:EmailAddress>Axel.Kellermann@smk.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
index 3763a053..2861ffda 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
@@ -14,7 +14,7 @@
<md:Extensions>
<shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
<mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
- <mdui:DisplayName xml:lang="da">MR-Forskningssektion (DRCMR)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
@@ -68,9 +68,9 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/drcmr.dk:667/simplesaml/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="da">MR-Forskningssektion (DRCMR)</md:OrganizationName>
+ <md:OrganizationName xml:lang="da">MR-Forskningssektionen (DRCMR)</md:OrganizationName>
<md:OrganizationName xml:lang="en">Danish Research Centre for Magnetic Resonance</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">MR-Forskningssektion (DRCMR)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="da">https://www.hvidovrehospital.dk/afdelinger-og-klinikker/mr-forskningssektion/Sider/mr-forskningssektion.aspx</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://drcmr.dk/</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
new file mode 100644
index 00000000..6328410c
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/sso.ucsyd.dk/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-11-25T15:49:37Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+ <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+ <mdui:DisplayName xml:lang="da">University College Syddanmark</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cDovL3Nz
+by51Y3N5ZC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
+DTI1MTIzMTIzNTk1OVowMjEwMC4GA1UEAwwnaHR0cDovL3Nzby51Y3N5ZC5kay9h
+ZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBWVi0x
+IHZpymWUjzYXWRS+LhvqJMeZGhijH46NzR34Zp1MAR1Ieqgu4zopUhpJQ1hE767e
+oYSpOFsT4SpSTZnAfTPwtlWCb+7cr8dhzbh+WDtTuN7aImkBSkKI4QY/1OHcz/P8
+VFLG9DE9GVEdTChlbbU1AIYp9dTRIT+dYcE9b28GRJ16S7mm+27675hnMDHbza1l
+dkrf+vI9Sb9X6NBIUwkWJlhpmYcDKHTgnqroNv819B0tQjRI+UzAHr/Rx9z/KHlW
+gOu+TSTQEzrp7TDaLDgGv8urLwsmBGNxY2A6AycN4HdQSaMHGOTPVm76AJz7uVI6
+khTTgjpn99S7L2hP
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cDovL3Nz
+by51Y3N5ZC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
+DTI1MTIzMTIzNTk1OVowMjEwMC4GA1UEAwwnaHR0cDovL3Nzby51Y3N5ZC5kay9h
+ZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBWVi0x
+IHZpymWUjzYXWRS+LhvqJMeZGhijH46NzR34Zp1MAR1Ieqgu4zopUhpJQ1hE767e
+oYSpOFsT4SpSTZnAfTPwtlWCb+7cr8dhzbh+WDtTuN7aImkBSkKI4QY/1OHcz/P8
+VFLG9DE9GVEdTChlbbU1AIYp9dTRIT+dYcE9b28GRJ16S7mm+27675hnMDHbza1l
+dkrf+vI9Sb9X6NBIUwkWJlhpmYcDKHTgnqroNv819B0tQjRI+UzAHr/Rx9z/KHlW
+gOu+TSTQEzrp7TDaLDgGv8urLwsmBGNxY2A6AycN4HdQSaMHGOTPVm76AJz7uVI6
+khTTgjpn99S7L2hP
+</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/sso.ucsyd.dk/adfs/ls/"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">University College Syddanmark</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University College South Denmark</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">University College Syddanmark</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University College South Denmark</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="da">http://ucsyd.dk/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support"/>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/core.uwap.org.xml b/swamid-interfederations-1.0/core.uwap.org.xml
deleted file mode 100644
index ac7aacde..00000000
--- a/swamid-interfederations-1.0/core.uwap.org.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
- <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
- <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UWAP</md:ServiceName>
- <md:ServiceName xml:lang="no">UWAP</md:ServiceName>
- <md:ServiceDescription xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://uninett.no/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Åkre Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/dev.wiseflow.dk.xml b/swamid-interfederations-1.0/dev.wiseflow.dk.xml
deleted file mode 100644
index e52a0d04..00000000
--- a/swamid-interfederations-1.0/dev.wiseflow.dk.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.wiseflow.dk">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-12-19T20:51:32Z" registrationAuthority="https://www.wayf.dk">
- <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
- <md:Extensions>
- <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
- <mdui:Description xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</mdui:Description>
- <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
- <mdui:DisplayName xml:lang="da">WISEflow dev</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">WISEflow dev</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUA MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g RzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGsw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI 61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEu P0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9 bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u 4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/ 3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5 AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw b3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGsw CQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0f BDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFp bnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjto dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNo YTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24u Y29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff 53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0B AQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsL pPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpG b/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dK P8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV 4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk 20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="da">WISEflow dev</md:ServiceName>
- <md:ServiceName xml:lang="en">WISEflow dev</md:ServiceName>
- <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/foodl.org.xml b/swamid-interfederations-1.0/foodl.org.xml
deleted file mode 100644
index 91edbfcc..00000000
--- a/swamid-interfederations-1.0/foodl.org.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:Company>UNINETT AS</md:Company>
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
index 6608593a..bd3c5114 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -3,13 +3,13 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
<mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
<mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
@@ -19,40 +19,6 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
-BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
-UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
-HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
-VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
-bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
-2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
-B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
-2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
-NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
-HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
-AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
-b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
-ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
-CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
-cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
-HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
-cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
-ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
-ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
-JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
-JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
-R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
-FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
-f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
-e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
-An5aXL3c9Q==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
<ds:X509Certificate>MIIHATCCBOmgAwIBAgIEC/N6MDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJG
STEhMB8GA1UEChMYVmFlc3RvcmVraXN0ZXJpa2Vza3VzIENBMRowGAYDVQQLExFQ
YWx2ZWx1dmFybWVudGVldDEqMCgGA1UEAxMhVlJLIENBIGZvciBTZXJ2aWNlIFBy
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi.xml b/swamid-interfederations-1.0/fse.eduuni.fi.xml
deleted file mode 100644
index 40e8b13c..00000000
--- a/swamid-interfederations-1.0/fse.eduuni.fi.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Eduuni-työtilat</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Eduuni-workspaces</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Eduuni-työtilat on opetus- ja kulttuuriministeriön toimialan yhteinen sähköisen työskentelyn ja verkostoitumisen alusta.</mdui:Description>
- <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="sv">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
-BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
-UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
-HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
-VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
-bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
-2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
-B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
-2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
-NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
-HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
-AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
-b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
-ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
-CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
-cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
-HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
-cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
-ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
-ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
-JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
-JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
-R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
-FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
-f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
-e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
-An5aXL3c9Q==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Eduuni-tyotilat</md:ServiceName>
- <md:ServiceName xml:lang="en">Eduuni-workspaces</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Eduuni-tyotilat on opetus- ja kulttuuriministerion toimialan yhteinen sahkoisen tyoskentelyn ja verkostoitumisen alusta.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Sami</md:GivenName>
- <md:SurName>Saarikoski</md:SurName>
- <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Toni</md:GivenName>
- <md:SurName>Sormunen</md:SurName>
- <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/haka.saimia.fi.xml b/swamid-interfederations-1.0/haka.saimia.fi.xml
deleted file mode 100644
index 4fd30a12..00000000
--- a/swamid-interfederations-1.0/haka.saimia.fi.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://haka.saimia.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
-OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
-KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
-DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
-sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
-BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
-ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
-MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
-9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
-1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
-0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
-E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
-2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
-PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</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://haka.saimia.fi/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://haka.saimia.fi/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://haka.saimia.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
-OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
-KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
-DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
-sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
-BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
-ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
-MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
-9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
-1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
-0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
-E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
-2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
-PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://haka.saimia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://haka.saimia.fi/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">Saimaan ammattikorkeakoulu</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.saimia.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.saimia.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.saimia.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Ilpo</md:GivenName>
- <md:SurName>Olkkonen</md:SurName>
- <md:EmailAddress>mailto:ilpo.olkkonen@saimia.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Saimaan amk</md:GivenName>
- <md:SurName>IT-palvelut</md:SurName>
- <md:EmailAddress>mailto:haka-admin@saimia.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Saimaan amk</md:GivenName>
- <md:SurName>IT-palvelut</md:SurName>
- <md:EmailAddress>mailto:haka@saimia.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.aalto.fi.xml b/swamid-interfederations-1.0/idp.aalto.fi.xml
deleted file mode 100644
index 09d7ec24..00000000
--- a/swamid-interfederations-1.0/idp.aalto.fi.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" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.aalto.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTExMTAwMDAwMFoXDTE2MTExMDIzNTk1OVowOjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxpZHAuYWFsdG8u
-ZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjQ14Y5ls9qgndtooF
-Z9tekHhuETMtovhozaCqvm6HwVE+jEo9ik4zwre42zTGz2QACBOldN5RlFw/A3kJ
-oGK5jEqQZFIw2XG22C+A7NNoZLqgGH7K3BYlYpI1Vpqpx+tk2/QpVUi4JqdIfVxT
-KHQZIW66dV4Zz+JMlAiPR/qzjLBYwUBllE5GG/BMBo7fQvMKqfrdAi3QcPdsiAQG
-Hl39WcchL53Y2tN8xOq2bkk6XOELBEe6byYdVgRzsGi6eyQHPvcWGb/Fl2JPahUj
-WM8Zz1w077omI4tzq/OLhnKAB/J25m9SAh23rq/lCFrnle528tE/nRBqX/yop8Hh
-n++dAgMBAAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-7TAdBgNVHQ4EFgQU7fL+WKGykn8q5Nden977Qx3neOEwDgYDVR0PAQH/BAQDAgWg
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5hYWx0by5maTANBgkqhkiG9w0B
-AQUFAAOCAQEAMqh4jbB8O648lGCpqemnz15SXeHGdQAyfvC3xDwEVa7eplPzeSg1
-XW1MqufDwc6j7nO5fYtULdMuj7/GM9gXkiU2Zv+qPbymrdADan8zqHQ65Ph+JarH
-U+WwQBqDu5B4ZLpp1188FPxqX+cq/5AdJ0/yxiQjG5yC0o5iPV94AEnUBCrB7Kp1
-Y79B00ak/mPB48aieNaM+iyYfkmyrzg7qlaRcXhh0CsFlL9zDt7l8eUImkesv6UM
-Cxdagkq9pUvFaktXeSRZbrRFcaP2j/TqkPnCtuoK/oQxvwcnllp4PqGQHypWfHOd
-ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Mika</md:GivenName>
- <md:SurName>Niemi</md:SurName>
- <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Tunturi</md:SurName>
- <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Tunturi</md:SurName>
- <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.abo.fi.xml b/swamid-interfederations-1.0/idp.abo.fi.xml
deleted file mode 100644
index c373b984..00000000
--- a/swamid-interfederations-1.0/idp.abo.fi.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.abo.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA0MDUwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmFiby5m
-aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO5UWgT90vXzUDlkapH5
-CVGFvoVgNDWxVr7WhrH+z2moP5h1wkK/Dnr0CKsglVyNkHycNkLmNH/9CVynp6LN
-sl+CEli5BmskLGNAvc+Q9bQwV52OJZQnXeCDDYSwSgDiIgrrml8niocBehGJEORC
-KW51UErjEf6U//1VfW1vG2r3BydjqM7pqs2GZx9p/US7F6lds8La1Vf/jp1ErW6G
-g1TzHYkx56EYNpqjo2Uin2vHowhidM37grjJQJ+q2qb7JsS4t074EwEQA0fF4wKa
-Yv6coSZyOpPXuuDLDlp3/dfY+beqR2oRml3HMvPnSp8+x/4y3/zEkcXcksmlwVCG
-LBUCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBT6OoUGpLGH7zyiXK+pmGrcVKeRnDAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmFiby5maTANBgkqhkiG9w0BAQUF
-AAOCAQEABsw3n2IGqqaYTvw7lHIvQzk6FmF3TqhJIV3SZv6Pm/sY1gY/RAykgGkM
-Sggdizdzf7LdaKaJRLOkUjj+za2zCGIE2n75XQBG4Qh+fcSfUFyCOdelGAOsoUDX
-nm7SpO8lLINjKr28Z7ll70fYUUvuwntEfYVcWtiZ/dicL8GWrcewROGGMDuKynKy
-UpUufLIUdgHlejsfRYwsV+rOMlDnzI4Mgw06fqiILAHhW1sGAD6yQ6FX2zOR5oVU
-4jIupvZYa1oNsIp/M5Ks7/uTY9T0cOYFlQaesTr6Mb18BK/lhvZ8hUblemAxM5DJ
-eg6LbC2vP3oGU43ehAd8KuMBp3jegA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Barbro</md:GivenName>
- <md:SurName>Sjoblom</md:SurName>
- <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Dennis</md:GivenName>
- <md:SurName>Holtlund</md:SurName>
- <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Barbro</md:GivenName>
- <md:SurName>Sjoblom</md:SurName>
- <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Barbro</md:GivenName>
- <md:SurName>Sjoblom</md:SurName>
- <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
index bc2fc1fe..59a6027c 100644
--- a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
@@ -5,14 +5,14 @@
<shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
<shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
- <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+ <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
<mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
- <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
+ <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
<mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
<mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
<mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
deleted file mode 100644
index d75aeb63..00000000
--- a/swamid-interfederations-1.0/idp.csc.fi.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
- <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
- <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
- <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
- <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
- <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
- </mdui:UIInfo>
- <mdui:DiscoHints>
- <mdui:DomainHint>csc.fi</mdui:DomainHint>
- <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
- </mdui:DiscoHints>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmNzYy5m
-aTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALxQbKAbjH1Y6nXZLERE
-+8+VuH3w0K/FXMG3K0ySP36uU5QylaFDTx++DZT+IlEwuEXEHoW673P1ymL/Gg1j
-+SlZdBxH6fFOqSLaT1jFtrpWleIwTWJtupwbB+GVNaPCFvo0snB0u4x1czcisFvG
-kc+GTN99e7dcuLA2kaQsVtoH9BLY99rubto6jbPdAb98htm+1a4yBZ/k3cirpDLo
-TZn2ILV/wEnsU/CdELweBm+3Ws6RcneqS6q+iNX6arA3+/eskksqbvd0PbbWHVl1
-b3r21T82lo+V6AdxBEKyZvlrxek8T8/m15AIAy6Id4GC/dc2crMFfrQV0hjXl//M
-ssOzUnbf5gJsX1ZHg8XrdEb60cssI0kriOOjDahYOCfP7nYYC26XzTrwfqQuQv/s
-3ZADXmQeLcMG42U2iBJaeXoqS1GymnToX08hx/UxabLSi+Hd2xOkurddq7A9x+Y7
-43q/6wKLoByNyFdyDVe+Tczap6vySov/WF5NgSn6mHfiC+EOHDhLQsRISyCTYWh/
-nmECl7nwaslnKfotwh+ax5EIlOF89dWOYgQk99ry6p8PrnJciHp5YsQGFi2uahwX
-Wy0Q0GWwPluh9QPRyV2Msk/xKYfkQV+JGk6jrES+6kHMI3xj6kf47u1jn8hSZmVR
-EbJgpgP8VadStP6zCWMBWbTdAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUT4gxrqHsUIEm8Q6JLQ79lpx1VrIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMHgGA1UdEQRxMG+CCmlkcC5jc2Mu
-ZmmCEWhha2EtaWRwMDEuY3NjLmZpghFoYWthLWlkcDAyLmNzYy5maYIRaGFrYS1p
-ZHAwMy5jc2MuZmmCDGlkcDAxLmNzYy5maYIMaWRwMDIuY3NjLmZpggxpZHAwMy5j
-c2MuZmkwDQYJKoZIhvcNAQEFBQADggEBAHLHoTcTEV6UgJ/RvzuRuQJlcxEURYzs
-Vg5WroFJYpGUa3OPHqHdWWJIAYWjE21oRKoxrOigpr/Ux24AP7z6OEh/ACUtrT86
-nwl2FZsWJOQ/7kkplDs3Yjy+7kkQyUVZoiPcNVE9nRVJuX0J2pwq29dkDibgTiv1
-QsoRrRYbh+Ocsi72e5feCe/vY9ZjnwKQmfQsDmzU72PwaJ5AwHh2bHE+9Eoj7AiN
-OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
-yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Janne</md:GivenName>
- <md:SurName>Lauros</md:SurName>
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 4a84a014..69e3a67c 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -8,6 +8,7 @@
<shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">alvdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">andebu.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ansgarhogskole.no</shibmd:Scope>
<shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
@@ -38,6 +39,8 @@
<shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bygland.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bykle.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">cmi.no</shibmd:Scope>
<shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
<shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
@@ -46,6 +49,7 @@
<shibmd:Scope regexp="false">dovreskulane.no</shibmd:Scope>
<shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">e-h.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
<shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
@@ -192,6 +196,7 @@
<shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
<shibmd:Scope regexp="false">inderoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">iveland.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
@@ -265,7 +270,6 @@
<shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
<shibmd:Scope regexp="false">nih.no</shibmd:Scope>
<shibmd:Scope regexp="false">nissedal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
<shibmd:Scope regexp="false">nla.no</shibmd:Scope>
<shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
<shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
@@ -406,8 +410,10 @@
<shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">valle.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vennesla.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">verran.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
@@ -418,6 +424,7 @@
<shibmd:Scope regexp="false">vindafjord.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vinje.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">westerdals.no</shibmd:Scope>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/idp.ids-mannheim.de.xml b/swamid-interfederations-1.0/idp.ids-mannheim.de.xml
deleted file mode 100644
index 8e44ef54..00000000
--- a/swamid-interfederations-1.0/idp.ids-mannheim.de.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
-MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
-NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
-8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
-mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
-mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
-WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
-AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
-4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
-BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
-b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
-MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
-QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
-bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
-HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
-xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
-VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. For Humanities and Social Sciences researchers.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Oliver</md:GivenName>
- <md:SurName>Schonefeld</md:SurName>
- <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
deleted file mode 100644
index e1e1e9e7..00000000
--- a/swamid-interfederations-1.0/idp.lapinamk.fi.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.lapinamk.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">edu.tokem.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">lapinamk.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAPU41ovbqC7No8q/JafFb+0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMjMwMDAwMDBaFw0xNzAxMjIyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLmxhcGlu
-YW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr050+KUHu9a+
-je75uUh/iQCBuoBdOtTRN5NHKK4cRKfM2+0+10zSvCxbcbul0T+yKbiHL5fVVOmm
-T3EZ0M0uInzjgICg63u5HmaF90DjFLpBtaZX/TTaWzvdFODFgqnZabyW/30ea7Zq
-5/8b0NK5Q/klEFYO4TIgkkBVwIlI6pGU/X9V596iEPHfyylR2dEIARviYTeqdQg3
-GVig/DngKBcan11pmEu3mhjVJl+yXRQeGhdeNXC7k8e3XMwEn/L2TEFy909qgHdT
-3Jm2y0g7SHzRoPt4UGJVx0t5dYFRPSEfJcxlP6/B5boU0RpYMa3AjBv7Nnk12+Ww
-vNQAf8Mt3wIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFBghh/DvfWtZXDg/l/liGeY0dFwlMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9pZHAubGFwaW5hbWsuZmkwDQYJ
-KoZIhvcNAQEFBQADggEBACI8smMl17k5l6eOmo1E9yZkF/QasMOd7NaiNT7Cmddt
-nAHtPG7nNFJX+Vj7aOhxZb6Dicp8aPueeswp1tX36PLj4QImXwLs/MoZ0DRUpsAI
-dqBucmey2exV/eIsfLoEOGnoe9aJJHbf1FS/0c4JR7PUfKShp7mYrROKmVZ+N/ya
-ohzJ/hrZTS8lhx46mWsy8WJoZyvV8SSU7SJTblRU1rbjhMIwXWGpAXgq69Oa72IY
-SUNstvZgVwotwKijIBs0iDamz8pzrMKBN1Qft+gzNRC19ijM3S+Ydrx23uBOJz9S
-iBFAJu7GLakQ21kx0iJw7Cvw3dG4QswwoiTV55pAx6g=</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://idp.lapinamk.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Lapin amk</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Lapin amk</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.lapinamk.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.lapinamk.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.lapinamk.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Markku</md:GivenName>
- <md:SurName>Taipale</md:SurName>
- <md:EmailAddress>mailto:markku.taipale@lapinamk.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jukka</md:GivenName>
- <md:SurName>Heikkila</md:SurName>
- <md:EmailAddress>mailto:jukka.heikkila@lapinamk.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.metropolia.fi.xml b/swamid-interfederations-1.0/idp.metropolia.fi.xml
deleted file mode 100644
index 840bd980..00000000
--- a/swamid-interfederations-1.0/idp.metropolia.fi.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.metropolia.fi/idp">
- <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 regexp="false">metropolia.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
-b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
-wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
-P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
-aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
-YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
-bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
-9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
-DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
-7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
-tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
-b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
-qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
-G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</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://idp.metropolia.fi/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.metropolia.fi/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.metropolia.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
-b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
-wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
-P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
-aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
-YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
-bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
-9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
-DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
-7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
-tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
-b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
-qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
-G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.metropolia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.metropolia.fi/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">Metropolia-ammattikorkeakoulu</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.metropolia.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.metropolia.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.metropolia.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Jani</md:GivenName>
- <md:SurName>Kaljunen</md:SurName>
- <md:EmailAddress>mailto:jani.kaljunen@metropolia.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jukka</md:GivenName>
- <md:SurName>Veikkolainen</md:SurName>
- <md:EmailAddress>mailto:jukka.veikkolainen@metropolia.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.oamk.fi.xml b/swamid-interfederations-1.0/idp.oamk.fi.xml
deleted file mode 100644
index c2536800..00000000
--- a/swamid-interfederations-1.0/idp.oamk.fi.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
-MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
-ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
-9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
-ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
-H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
-qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
-gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
-j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
-A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
-LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
-aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
-AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
-T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
-K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
-Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
-Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Panu</md:GivenName>
- <md:SurName>Jylha</md:SurName>
- <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Panu</md:GivenName>
- <md:SurName>Jylha</md:SurName>
- <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.shh.fi.xml b/swamid-interfederations-1.0/idp.shh.fi.xml
deleted file mode 100644
index 4e0db6ad..00000000
--- a/swamid-interfederations-1.0/idp.shh.fi.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" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.shh.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">hanken.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQR1F2IKk/FGfCBPi7E7Lr9DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTAxODAwMDAwMFoXDTE2MTExMjIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuc2hoLmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0tjmJ1ERx/Za5uVfPURB
-8eTAKK0QEXJD/++dCZcVSrIpau8jiLkmi+kzweI531JVBDrpT24jFGXn2cKnzUIB
-xpOWEUKLQSkYdA3LoKD1gJjjFxF8Y3J237Zlg3QL/dmNnfCLxs8SsXbCsjxpuPAP
-wYRR1ZEL2SjdU3zEDc4iqMqkk5wS4lzjB1SMNFaaKRRsW97BAKATyHRwp4a01nB4
-o0MDNn4iGcIoE3kO9X83H7smurBXGqVzc4dnfH3yLOXF+NMpRbH9upSrSBe2EoZU
-jc+Vi4/fsEXRmr/u+8IOb1ERpYNLCd6L+mD9ppbA3ZeRJe/LRaq7MFQX3VzMR5mn
-xwIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFH9BqIu5UIBGpznMYuQP3dJQ6f7zMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuc2hoLmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBk7DXTXfwZCTrFUVB73h4TzHF2zrIUm83SFCNcn5BBA9qKRL/TfozD4ZwK
-1zfaVtcc8gpS4tUE+T3dOa2zKvUgYSuDScC7cInBht1wLUrukBhQCDIU+0lKaBJv
-A17KXHxowqua95sMKkN3tDUB7lbLCuPxhJyWzE2E9TrJ2oTYQ35C3cGd5FbnLEWk
-9ceS4WR5+t1lpvC4uwWrc0DYgb0ADv9TDW52/qssZKNLbVu5BwRKI6ToAZTgnNbf
-aeNbuslxAJn11gg6nMy8yRVZMTOMZoLK5j4vNXhp8YngrWxdGBDIaEtLvLWfIs99
-nAiHebdvpVCIMaM703zAuuDVImHf</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shh.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Hanken School of Economics</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Hanken School of Economics</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.hanken.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.hanken.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.hanken.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Kuno</md:GivenName>
- <md:SurName>Ohrman</md:SurName>
- <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Johan</md:GivenName>
- <md:SurName>Isaksson</md:SurName>
- <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Hanken</md:GivenName>
- <md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>mailto:help@hanken.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.tut.fi.xml b/swamid-interfederations-1.0/idp.tut.fi.xml
deleted file mode 100644
index 8fe21a38..00000000
--- a/swamid-interfederations-1.0/idp.tut.fi.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.tut.fi/shibboleth2">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
-TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
-1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
-mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
-jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
-c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
-iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
-R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
-Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
-7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
-DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
-ov0reXszINweUWTYJchavcG3Dfyx</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://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
-TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
-1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
-mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
-jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
-c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
-iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
-R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
-Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
-7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
-DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
-ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jussi</md:GivenName>
- <md:SurName>Tirkkonen</md:SurName>
- <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.uef.fi.xml b/swamid-interfederations-1.0/idp.uef.fi.xml
deleted file mode 100644
index 5c0771e6..00000000
--- a/swamid-interfederations-1.0/idp.uef.fi.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.uef.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
-MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
-biBGaW5sYW5kMRAwDgYDVQQLDAdTaGliIENBMRQwEgYDVQQDDAtVRUYgU2hpYiBD
-QTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckB1ZWYuZmkwHhcNMTQwNDA5MTQx
-MTIzWhcNMjkwNDA1MTQxMTIzWjBZMQswCQYDVQQGEwJGSTEmMCQGA1UECgwdVW5p
-dmVyc2l0eSBvZiBFYXN0ZXJuIEZpbmxhbmQxDTALBgNVBAsMBFRpa2UxEzARBgNV
-BAMMCmlkcC51ZWYuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
-JZ1AwVGJ2S7FOsjH/vsvo2SEsUwN9QFdz4Kf+QBR50NaOocbl6wV6spOt//d/Tbp
-M9qs4Z9EgfT8hvCjNLRhI4m8w6XhYlA/MmBcxgQBYn19xoUTJ3DcJJddLIQsMU2H
-qOKoiYWwLL1ZQgbFG5ilZ15ZWpUXRBdDt9Hn8eK2SF2dPNrUKuAOZyDkMSY9cfwR
-pWrSUwX7Mm9+8TceZHWHaoPR2nbBABqBNuhXvZl6yK+bGXFvbPNGbMJTwXY/LJvc
-4x+sSDuR7HM5tGFcwFjVfj2yEva9BwG8jXWB/RSj7eleHLLM7+PvvR5axVaPbQ/9
-CIJjgPh1r8P8arKs140LAgMBAAGjJjAkMCIGA1UdEQQbMBmCCmlkcC51ZWYuZmmC
-C2lkcDIudWVmLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQA9xGaMiAZM1Ivp3XcTeNn2
-2U/vcCD9fZ9FbrB9buJrECPFh31xJqCtY4gTqdJZl9Z9T3e3I8SqahRPdKX8QPed
-XpIjKfMDM9SBSzMFuSUWyVrbvNCrQScwX+qD5PlpsACQzAGC+Q2pF5lqVx9zERef
-fq7jOiSACuaC39ymek0Wok1k6Mes9krUmwJOdP4SjPmgzWCdeh9X/d3xHgUpg2x5
-Sami+WFaMgXxZxJhK+roCmH3hkSh3r8U7xlrnfckSfQ2es9PGYnFI6UlZJqqtrTc
-WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</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-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Jarno</md:GivenName>
- <md:SurName>Huuskonen</md:SurName>
- <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Markus</md:GivenName>
- <md:SurName>Hagman</md:SurName>
- <md:EmailAddress>mailto:markus.hagman@uef.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jarno</md:GivenName>
- <md:SurName>Huuskonen</md:SurName>
- <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Jarno</md:GivenName>
- <md:SurName>Huuskonen</md:SurName>
- <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.ulapland.fi.xml b/swamid-interfederations-1.0/idp.ulapland.fi.xml
deleted file mode 100644
index 2c4ebebd..00000000
--- a/swamid-interfederations-1.0/idp.ulapland.fi.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ulapland.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">ulapland.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIGrDCCBJSgAwIBAgIQdmrtc4rB3ElPE0L6/94NTjANBgkqhkiG9w0BAQUFADA5
-MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2Vy
-dmVyIENBIHYxMB4XDTE0MDQxNjEwMjQ0N1oXDTE2MDQxNTEwMjQ0N1owgYQxCzAJ
-BgNVBAYTAkZJMRAwDgYDVQQIDAdMYXBsYW5kMRIwEAYDVQQHDAlSb3ZhbmllbWkx
-HjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgTGFwbGFuZDEVMBMGA1UECwwMSUNUIFNl
-cnZpY2VzMRgwFgYDVQQDDA9pZHAudWxhcGxhbmQuZmkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDF4kd9ojVzXalhcDQm+DqVC9DAv+SNYCxSWnhbkms2
-8PPk5cMT6WfHy242QSKYZe2Asbvx856xCxbI+pkEtN7MyeDGu5PmFetwcSj5qaVG
-5spVNoZAgzLKWTzBfmxTT9EjhDioLV2ObqIzR+NTOCvQjfEGKpw9Lg9JobadmUwp
-kDhk1Y3o7ERBnOdyVFfvggl8sUMzU47XJfxk+jlpvOy7x3rQswTTOaGZkgd0OVxC
-awr6HzbBTEu08AiX2nsD3GnqSUPS38/K26a5KGOzFx7j+kT4K+ICBiPTFYgTKgln
-50rIwCn2wYf96vb/Vj6KT/S3WpQ6hVLMie5QA5Zuwl4rAgMBAAGjggJiMIICXjCB
-jQYIKwYBBQUHAQEEgYAwfjAtBggrBgEFBQcwAYYhaHR0cDovL29jc3AudHJ1c3Qu
-dGVsaWFzb25lcmEuY29tME0GCCsGAQUFBzAChkFodHRwOi8vcmVwb3NpdG9yeS50
-cnVzdC50ZWxpYXNvbmVyYS5jb20vdGVsaWFzb25lcmFzZXJ2ZXJjYXYxLmNlcjAf
-BgNVHSMEGDAWgBSggb5Vm/N/YQWEiy0MO+AISe5XPjAZBgNVHSAEEjAQMA4GDCsG
-AQQBgg8CAwEBDzCBygYDVR0fBIHCMIG/MEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1
-c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2MS5jcmwweaB3
-oHWGc2xkYXA6Ly9jcmwtMS50cnVzdC50ZWxpYXNvbmVyYS5jb20vY249VGVsaWFT
-b25lcmElMjBTZXJ2ZXIlMjBDQSUyMHYxLG89VGVsaWFTb25lcmE/Y2VydGlmaWNh
-dGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMA4GA1UdDwEB/wQEAwIEsDB4BgkqhkiG9w0BCQ8EazBpMA4GCCqGSIb3
-DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQB
-LTALBglghkgBZQMEAQIwCwYJYIZIAWUDBAEFMAcGBSsOAwIHMAoGCCqGSIb3DQMH
-MBoGA1UdEQQTMBGCD2lkcC51bGFwbGFuZC5maTANBgkqhkiG9w0BAQUFAAOCAgEA
-KrVSvHwBWFnLVT/pQoSRaNMTnMymhmYDM78Lo2PVXLEnfmuD8pZYXFTLGxRMDkM/
-bC8oGTXFKBmphr0wn2unD06itE+XBZXpQac+497q1Fb7/rgmf7Vp11Zq2m2yUnjm
-NaGIsjgP+K6Y1EmeAXicbMVHVjJ2MmBuwTRhZI5kOIktUWrHuthSQ3Vu78Urdirz
-fEC0lqokvJIABrQQf36sZc84p7oyrO7EWb2BePM3ZtNQwSpDATTdhDTTdVgETA6T
-JGOcnvlP6i2rVel18noDgvoUuPr8TKkeV5uyc0cF7nfLnqQpRiLrWnF1Eko0Ze3w
-QmGUdoWkB/RQ9BgJ3Bbfo+37EZg+VxXBCI0chCEXjFwMAurS4SzBYplZsBr7WxXH
-JsrHg0F9JQvo5wQ04sZuiMP3WQhVuTdvHay11pih6GY1ujlMMjlbqlg1SrCJ3tMi
-jwhCYD9uz2EVokoHVRBYfsr9iE9H/Fo9PXYIZJNRdpSQahLammOLqnhmhRGBMtg6
-6zHBsKhwIbmxyb2z8ri2J4bucZG0tLqw+5pm39zMjHpvjUJ49cNhVF8hH8Tsxglb
-WBUVl8rtnAcsFuvvT5nyxPRV6+2hromsdwEK4PeUyLz0BFxQM5U/J9KOhC1faVfM
-sNec1gZqKR5mpgC1RQRtCn3q7woBwcokimHhhsFgFu8=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulapland.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Lapin yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Lapland</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Lapplands universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Lapin yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Lapland</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Lapplands universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.ulapland.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.ulapland.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.ulapland.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Arto</md:GivenName>
- <md:SurName>Hangasluoma</md:SurName>
- <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Esa</md:GivenName>
- <md:SurName>Matasaho</md:SurName>
- <md:EmailAddress>mailto:esa.matasaho@ulapland.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Arto</md:GivenName>
- <md:SurName>Hangasluoma</md:SurName>
- <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Iikka</md:GivenName>
- <md:SurName>Kupari</md:SurName>
- <md:EmailAddress>mailto:iikka.kupari@ulapland.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/login.helsinki.fi.xml b/swamid-interfederations-1.0/login.helsinki.fi.xml
deleted file mode 100644
index 986ba144..00000000
--- a/swamid-interfederations-1.0/login.helsinki.fi.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDYxNTAwMDAwMFoXDTE1MDYxNTIzNTk1OVowgbcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
-BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
-HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
-bnRlcjEaMBgGA1UEAxMRbG9naW4uaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDrQpyohqDuaPxlOQDkWC/I/aw1ZhYMjLVDEx7x6XxR
-W9C5J4tTXpYYT3Us+oEUSJObhBTSm9EQ0tbDqnZjubwWZDkXHr1tnyP+JCFoFTZ/
-tqV768I3fE3TKdgEY3paVM8MWZPoyJf4uy1dKCz5lwie3anIYNVXw6mlPqbI9zAT
-b5elTMn+cBw9dML4dAQVODTuDJ2+avRMO4ItuqEj5f5PdI0HUjLU2ejRUQLP2nNX
-2MWgtweWvTIS/IWO1neE3Kn8v3j1VLdS3Xk2t/UBSeGl5e6MARhiHbLtigAWuIZv
-1pznlwdppBOzACm0e3somcJrbFnFOnbGmRQKtXq2yQJ3AgMBAAGjggFkMIIBYDAf
-BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUqm3ksXlN
-/umZswjtgICNhBMvWlAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRbG9n
-aW4uaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBACHDbip+j9xIvdz0WXvF
-4jhBCz4FoGoe7THcFwhVZL8oO3pKGyFHvAFQjdxibgWimOjYQyEnRoE2NYi27ccj
-S3hTQ3xcxoN6Zwq7Nq7iFNmQJ6Lc2uimU5zW7tLRqlTWQKKUm6/niFYv598Mg0PT
-NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
-9W8PdlbMcU04uznzo1v5EggbllAoFoqgWLL36H9zkbkh9NpA3a3j0PyvPaQHzwaC
-54RgRywzt/5g35mU+1cX4gTxt3aP6buBLAaEVtDJ+XQcfZJj3KhPQ2oo2y6Z6fNd
-Ahw=</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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Janne</md:GivenName>
- <md:SurName>Peltonen</md:SurName>
- <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Juha</md:GivenName>
- <md:SurName>Niemi</md:SurName>
- <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi.xml b/swamid-interfederations-1.0/logout.uwasa.fi.xml
deleted file mode 100644
index a5ba47cc..00000000
--- a/swamid-interfederations-1.0/logout.uwasa.fi.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://logout.uwasa.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
-BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
-VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
-cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
-le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
-AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
-iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
-Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
-du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
-IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
-eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
-HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
-dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
-SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
-exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
-1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
-7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
-OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
-bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
-pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
-jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
-V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
-8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
-4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
-9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
-StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
-+4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
-6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
-ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
-yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
-BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
-VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
-cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
-le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
-AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
-iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
-Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
-du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
-IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
-eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
-HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
-dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
-SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
-exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
-1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
-7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
-OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
-bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
-pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
-jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
-V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
-8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
-4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
-9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
-StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
-+4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
-6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
-ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
-yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Sami</md:GivenName>
- <md:SurName>Kinnunen</md:SurName>
- <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Sami</md:GivenName>
- <md:SurName>Kinnunen</md:SurName>
- <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/moodle.helsinki.fi.xml b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
deleted file mode 100644
index 02ddf702..00000000
--- a/swamid-interfederations-1.0/moodle.helsinki.fi.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.helsinki.fi/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">University of Helsinki Moodle</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
- <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</mdui:Description>
- <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFcTCCBFmgAwIBAgIQBs4LDAt4QhHxA6/9vcQV2jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJtb29kbGUuaGVs
-c2lua2kuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRJht4CmQi
-9WWU+ep1UhI11GXJTUXY4PzukaXUtO4RbZAnvd0U4Xb5sPDNsCVSIASBX0fkbSZJ
-yQ8FY/PhRk2QIt+erjReWIWA6V3UY6kJIq9IrUh4Z06aGrLvkEjHFbI0VA/AZ/8T
-2BxJrMg3v9mT12B9ueDvybIc6IERiDctRrB+s5nPskvua/2oTq4hDM9mGYTN4ZLB
-fR2OViwPxsGi3V22+iLa66JCmIK8kCeekNhS7OsclWWzIfPpCW1azjUZ2HrRndoi
-A/zJSpmT1rxY8WTchr0xdPdgVDzDZSv/FhRDacbFIC99drSWmg4wiYLvIidDt/zu
-tRoJdUGYPxqljdsyHwftjqqy2YNSMrxD8LDsaF07RZYjpK9GLDXroJzEOhlAJu/c
-qd4+RO+LjF21TWTe4Kw9u4+VNvjrfFDvkj5QAPxti70nOzkqY9Y+T4h1UNkyr8u+
-EGjNLOIE41B5V5MhTkf9x6lQD9IkejHpZA2bP5dmUtBft72UCPCDm2YMkLeXfOI9
-CaBkxLzi4doXmNLjXVEtsVx3qkvyH595ACnSaS/kUfnbgjaMdz15dh7PUPz2OQAE
-P3VijjcTzls96u81aBfHOHY1khqEueKkehJLq7ZFLefy/hcnFDMXWNMSeQaiGDjO
-qMAYHGzjR94Uar2Jvxvwzg2dF3GznzLZeQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB8kuozI2dNLBE+Oy8Ie
-Rp4+GmUeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJt
-b29kbGUuaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBAEkxmg/WVjzPKULi
-7OO3LiKrIgAhRchg8SGfngcgM6E2I8RoLS69/ZC0eWOubAZBJPfvCvaX5u3GWTWd
-dtHeCZWIKOhCFKMj079qWO27O67ys/E//vYakEnSxkpBkQ5u0tyolS7BFQcTWoPR
-BFc/Z+NaZhBmcm7tyFkQsrHTQZTq/s1Anxc7t3sXuUsFl4/LOEwiXkJYoxYOPE7t
-A0iMOwlhJ5VuCIEYZLJ1yA6AZCgJX8TgZvQEdsAxIA6VFJmXsJokBa/wDYQt5fPo
-kBViCHGTlh5cyshXEA2zL/Ywe8EjJkZCDWdoOC+r6CGtxjRxD7tvb/27+1dbYnI0
-Red7UuI=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Helsingin yliopiston Moodle</md:ServiceName>
- <md:ServiceName xml:lang="en">University of Helsinki's Moodle</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">University of Helsinki's Moodle learning management system.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Heiko</md:GivenName>
- <md:SurName>Schach</md:SurName>
- <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Janne</md:GivenName>
- <md:SurName>Peltonen</md:SurName>
- <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/moodle.utu.fi.xml b/swamid-interfederations-1.0/moodle.utu.fi.xml
deleted file mode 100644
index 185d9fe6..00000000
--- a/swamid-interfederations-1.0/moodle.utu.fi.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.utu.fi">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.utu.fi/Shibboleth.sso/DS" index="1"/>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEZzCCA0+gAwIBAgIQT5QLlkD90BQrkITUEnBTjzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTEwMTAwMDAwMFoXDTE2MTAzMTIzNTk1OVowOzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1tb29kbGUudXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0L
-rBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTv
-S/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hv
-QAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO
-4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3
-PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwi
-MfeM0wIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1tb29kbGUudXR1LmZpMA0GCSqGSIb3
-DQEBBQUAA4IBAQAqzKnyX9RnkwXwOM1szmj5iCMwTLVKl+ULpwxajHKs3Y8qXpgZ
-qR0JGgdAPE+qpWPQHRy+H0wwoAGwJHayyYVqd0WEUD6ET1YqxLGCbPA6I+gCLwN/
-2Gr2zU+BrPZ+Lbx3libwYEe4DtRhrHGvM+EoK703HLyQbAIFbQQG7xrEFOD4yjFB
-grT2zSpweu6njvXsomDNwjdCcG2sP7xOm5+ECGwB7RS85l6tAhkw/LR3msagUpZ5
-rol41Nc8xtMqDhVlI9K9MBfdGmj4wnvFzYS6bbAuMcOBUEllwtbhzzJf53XKQBZF
-0uKP0MosqHl91zcW2TOx0wxNhL4Hhavhe0hr</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.utu.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Turun yliopiston Moodle-oppimisalusta</md:ServiceName>
- <md:ServiceName xml:lang="en">University of Turku's Moodle learning management system</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Moodle-oppimisalusta</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Moodle learning management system</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Nadja</md:GivenName>
- <md:SurName>Plankevitch</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Nadja</md:GivenName>
- <md:SurName>Plankevitch</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/openwiki.uninett.no.xml b/swamid-interfederations-1.0/openwiki.uninett.no.xml
deleted file mode 100644
index 8e67777f..00000000
--- a/swamid-interfederations-1.0/openwiki.uninett.no.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
- <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:Company>UNINETT AS</md:Company>
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/portal.clarin.inl.nl.xml b/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
deleted file mode 100644
index 33a0d19e..00000000
--- a/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://portal.clarin.inl.nl/">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
- <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
- <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
-MDgyNTAwMDAwMFoXDTE2MDgyNDIzNTk1OVowgdIxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTETMBEG
-A1UECxMKSW5zdGFudFNTTDEdMBsGA1UEAxMUcG9ydGFsLmNsYXJpbi5pbmwubmww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+faM4kQs7smclVpmqWzzX
-ZbhhPBW4ulwloBRQY7iR0unaMAGbxobpHvar28sASdvZ7W8IL+Az2J714pceJpit
-s/1Q10cJBzmcopvHtR4Hp6PZxjdEUljrCifQt+IZeZw99TMH4gpeC9zhAdzyubFs
-d452dy8+oljTOlTumbr1zACGU5ZGUInru467GJtMHYTJDDS1/BGuVx0XKwo0idCC
-goGF8ZIxyHQq/2Q37Py10238nKx614U6KtE//dHP5KkLEHow1Vfm90N+czIkRt+4
-4jl91Cel58jfvjXF3I/Cspi7vFDjRMaeBHsrxtDBWVUOo9GSMWRUiCOeQvGASXcb
-AgMBAAGjggHYMIIB1DAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uMSty4sCJkazAd
-BgNVHQ4EFgQUbmgntbNatGZ2IBRNLqazqtbpwGAwDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
-IAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
-dXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwu
-Y29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0Eu
-Y3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29t
-b2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0
-MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
-MIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0YWwuY2xhcmluLmlubC5u
-bDANBgkqhkiG9w0BAQUFAAOCAQEARI37zQIk6P0aQkSMyambDpkm+ciyvWTur0Z4
-wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
-ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
-JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
-EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
- <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>systeembeheer@inl.nl</md:GivenName>
- <md:SurName>INL</md:SurName>
- <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>servicedesk@inl.nl</md:GivenName>
- <md:SurName>INL</md:SurName>
- <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/rr.funet.fi.xml b/swamid-interfederations-1.0/rr.funet.fi.xml
deleted file mode 100644
index 5c5d5cb3..00000000
--- a/swamid-interfederations-1.0/rr.funet.fi.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
- <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
- <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
- <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
- <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLcnIuZnVuZXQu
-ZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCo3JlR09DvNOKqY8J0
-X+OnAIgOz8mhKid0kjE/2sYlxPf+NJljQnIZYixD/Oj1eX0E2pb7XNZeSaUeBN+y
-Ge0L9b5r72910p0N8G2ZsycUfpzwUc80jJKPi0Vj0wE7M4itwF6ix7wUDLVKm7WF
-j19VdNhEO5v6oKql+Y1+LioWAGymfhxIf92r4VxUq7x4g5AFUwLE3U6MDa7KPreQ
-MVaPYX6MQBjhl1IksuMYiL9l32vRIBnsvKgJLPuj9w4rRLQksIS3Kq/ubaWcHRLV
-2vdTAlwSJGyFVvsKKUaLMa8PDi7Qh9XyGKBYNqpVT/y73Jen0qxB2ey/i/7s8Wpv
-bVaBmtPaSdrEzJAiF97wvShgKsMsMre5gQwb5Xm9+ivBr73nHyDOw8pPCgcXAZRS
-lMTu6YhVDqWpOj/FyGMmMo0Mr0CAsIKPN3uG2iT5ORkVBhtHufUkKbKtA/lHzGVq
-Wd5UXhvqJJCkdIR+6hW0KuhZCV3rQmav9uT5n0TLQehRL1MQWdno/U7e3gx364vt
-kBbSK6fLvRvUsdHI+82MkWfTFNa9auCgQr55cY5o6kDiEc1d7ofqXbMZFY4+9V9s
-A5b4a2rYfYKmA6QzoNz4Ed0ls45i44AbgBVMgB6gjWWnl8cwLGwbtXIXG2lLHJuJ
-ebv5jS3kU2+biivwcXfacBT+XwIDAQABo4IBjjCCAYowHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGdyR9kleLAF9CwyvqrCaVT6cRNi
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzA8BgNVHREENTAzggtyci5mdW5l
-dC5maYIQaGFrYS1yci5mdW5ldC5maYISaGFrYS1ycjAxLmZ1bmV0LmZpMA0GCSqG
-SIb3DQEBBQUAA4IBAQCqH0bVH4duhVkYw63tkRZTRLG83JGJWuZYA6bmntr80Wdp
-1OUW3Ez66sByA6hddAX1trKs+ChOehatsSVV4g9YvZzOT5fEU5kkl5ZX+j8aVHwc
-55q2VVkv9RmCdt23hLPZD6eoNc7uDmz8/Ol94zmd/jcXz5lwq3FNss0yMOJ5W5hz
-HnVn+FAnphU6TsJhBYuXkNziSOkrUeZyUTPpRMsz7OlmdrW+i6sLS6RxUprMM6rV
-aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
-7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
- <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Kari</md:GivenName>
- <md:SurName>Laalo</md:SurName>
- <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Mustonen</md:SurName>
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/shibboleth.bbaw.de.xml b/swamid-interfederations-1.0/shibboleth.bbaw.de.xml
deleted file mode 100644
index 8ceef1b3..00000000
--- a/swamid-interfederations-1.0/shibboleth.bbaw.de.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
-REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
-ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
-aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
-ZTAeFw0wOTExMTExNjI3MDdaFw0xNDExMTAxNjI3MDdaMGgxCzAJBgNVBAYTAkRF
-MTwwOgYDVQQKEzNCZXJsaW4tQnJhbmRlbmJ1cmdpc2NoZSBBa2FkZW1pZSBkZXIg
-V2lzc2Vuc2NoYWZ0ZW4xGzAZBgNVBAMTEnNoaWJib2xldGguYmJhdy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqdL1VpZaKldYSwvu4z+8iXzy+j
-+6tpAq1lED8CDcXRJsbgL/F4sioQ9uNylJgX4aromN5kTT8nfmtEN84C9s5ExVg6
-29bkxSPEWviJzdDxKstRqWbl7PzpipFa9Th2b7jOwX4ec3nirC4ijoTACQBge7qd
-GNniTFM/2k5E7D8NPTJg2d9ITWs8JW7Qbx0ezFpKlg1eVWZNZs86L3UShdXWnwrT
-oNtZwKm309EbdDNGDvsAgHseFNhmQIV+rOuMxv44nVMxDUSymARAKhzbeJ4CUWth
-gYjByHbQM45twUdQKGO01vQX+DwS+9RmA34PDZ8nRSktRtlG/Llr9SRXf9ECAwEA
-AaOCAY0wggGJMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUoy4g7ejcIv8AoY2/BQx6coBR6EIw
-HwYDVR0jBBgwFoAUjKaP8T8UOwK1+SdUTKs8odgbkJgweQYDVR0fBHIwcDA2oDSg
-MoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBrAUHthoQFOwKU
-a8KybrhK1NofkstRQxhVR2jcNWQDhFB+ife+kXdindHuh6OeWgys07llwmPqACQ9
-T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
-7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
-znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
-9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
-eQj7ACg8</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
- <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Kai</md:GivenName>
- <md:SurName>Zimmer</md:SurName>
- <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/software.msdnaa.dk.xml b/swamid-interfederations-1.0/software.msdnaa.dk.xml
deleted file mode 100644
index 7306b3e2..00000000
--- a/swamid-interfederations-1.0/software.msdnaa.dk.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://software.msdnaa.dk/">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://software.msdnaa.dk/login.ashx"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://software.msdnaa.dk/login.ashx" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">MSDNAA</md:ServiceName>
- <md:ServiceName xml:lang="da">MSDNAA</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to provide access to relevant Microsoft products for qualified students. The student will, for selected products, be notified by e-mail with product registration/activation information</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at give adgang til relevante Microsoft-produkter for udvalgte studerende. Den studerende vil for udvalgte produkter modtage e-mail vedrørende produktregistrering og aktiveringsinformation</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml
deleted file mode 100644
index f1ee1523..00000000
--- a/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.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" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
-MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
-A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
-aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
-AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
-mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
-orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
-gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
-BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
-OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
-bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
-KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
-bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
-LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
-9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
-uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
-s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
-nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
-OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
-MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
- <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
- <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Marco</md:GivenName>
- <md:SurName>Van der Laan</md:SurName>
- <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml
deleted file mode 100644
index f1ee1523..00000000
--- a/swamid-interfederations-1.0/sp.dev.clarin.inl.nl.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" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
-MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
-A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
-aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
-AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
-mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
-orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
-gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
-BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
-OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
-bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
-KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
-bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
-LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
-9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
-uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
-s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
-nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
-OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
-MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
- <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
- <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Marco</md:GivenName>
- <md:SurName>Van der Laan</md:SurName>
- <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.korp.csc.fi.xml b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
deleted file mode 100644
index 45933ebd..00000000
--- a/swamid-interfederations-1.0/sp.korp.csc.fi.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
- <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
- <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
- <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE2MTIxMjIzNTk1OVowOTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtrb3JwLmNzYy5m
-aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU16/1jE06KKH6uErmq
-e2wE5u+8SkWqR4Gks+iH67OiPTgoPSVfx1t55FHDUl1zQjijwcvejH26lYIpS7Ts
-js1MGcjcgEt1qFDDQ/eC6931hIg1jRa0PF/cxFjP9qEcd/I7UxuyM5QJga4pfl/o
-IHSL9oPYi5iCJ6qoC3dgNy0glMiisLkKyOKOHIXYzfAdMlIfRAMGCDAnDj3Kw4wK
-zv+RCWSGPEKHxfnPZwY8fgUs0vugICJBfQkSliUQm9P9l9Pt/8PP3XoIzgfXmxKK
-VQg/3EW+u2dnAzV1OKNrbJAajCJYL4VuGejWE7y8x+ixTqFCCPBT1cFZFWgFnzsh
-Yi0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBTkZV9BIXGhYb67UVmwNByxJxsAITAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILa29ycC5jc2MuZmkwDQYJKoZIhvcNAQEF
-BQADggEBAJClAngseLp5qnRUj2iFSlNVccoP9KZKhLaeqiUk6vvwNdyetfMu9Txi
-vllrbfIaoVMvcA3nE5lfWEAlpvoqnQO/wmDv3ObX/XLJpXqSFpNpDOllhEbVeylT
-v8qqjG84Y4OUAd46zhiFpXr+6InhbkahABizqoXs2/aLm3nutf8rWzwFQqm+8YLE
-eLvEROIn209q+8M0V95avRxK1/wTTqwTnEGlGfRU5aTct+hLpJIRQS1DsAJpVDLU
-eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
-5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
- <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Fin-Clarin</md:GivenName>
- <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Martin</md:GivenName>
- <md:SurName>Matthiesen</md:SurName>
- <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Jyrki</md:GivenName>
- <md:SurName>Niemi</md:SurName>
- <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
index 0e84855f..0821da4b 100644
--- a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
@@ -4,9 +4,9 @@
<md:Extensions>
<shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
<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:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
@@ -16,44 +16,45 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
+ <ds:X509Certificate>MIIHPjCCBiagAwIBAgIQCIdeZB1qcIkU4tTDCYnlyjANBgkqhkiG9w0BAQsFADB1
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
-BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
-MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
-DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
-aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
-vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
-DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
-YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
-Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
-7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
-+9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
-kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
-by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
-b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
-MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
-cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
-ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
-AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
-AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
-AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
-AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
-ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
-AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
-BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
-AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
-QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
-A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
-m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
-nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
-njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
-5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
-8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
+d3cuZGlnaWNlcnQuY29tMTQwMgYDVQQDEytEaWdpQ2VydCBTSEEyIEV4dGVuZGVk
+IFZhbGlkYXRpb24gU2VydmVyIENBMB4XDTE1MDYwMjAwMDAwMFoXDTE3MDgzMDEy
+MDAwMFowgd0xHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYB
+BAGCNzwCAQMTAkZJMRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9w
+aXN0b25tYWtpMQ4wDAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcT
+D1R1cnVuIHlsaW9waXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRQwEgYD
+VQQLEwtJVC1wYWx2ZWx1dDETMBEGA1UEAxMKc3NvLnV0dS5maTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANb4brlN95dEcJsy174MaeKqJ3UEM1p0bu8v
+jjBYCypuGX8bP3el8iWcSP8lcxGRrmACcD5Ko0N9y/ESTw0LrI32HDLvqARQu924
+uEkfvNgzm8ZXjTUtsHx/X+PCsECazmRxBuFVrX/c7+zks2FPJ650RfKBJ1KRTB/D
+jH1BVgT1ZE7DE5E5agOdu7/AvMviNerzBU4Q/CkiR8dW4BoO9LiyY3LLALzqa7FU
+8QiDQiA7U/QuNoH1BTdaOaTg+/Bqe9M1043Tc+afnmeFMu3fU4wszBGsYvS8Olye
+RsjHHonGTsJkTSLsnqCkwe/EJ6kzR3FTyFe84mZVLkwzOPvZZ6sCAwEAAaOCA18w
+ggNbMB8GA1UdIwQYMBaAFD3TUKXWoK3u80pgCmXTIdT4+NYPMB0GA1UdDgQWBBQV
+aoLw/rzHI5GO/ai1+ORFk6KdpTAVBgNVHREEDjAMggpzc28udXR1LmZpMA4GA1Ud
+DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdQYDVR0f
+BG4wbDA0oDKgMIYuaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL3NoYTItZXYtc2Vy
+dmVyLWcxLmNybDA0oDKgMIYuaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NoYTIt
+ZXYtc2VydmVyLWcxLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwCATAqMCgGCCsG
+AQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMIGIBggrBgEFBQcB
+AQR8MHowJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBSBggr
+BgEFBQcwAoZGaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hB
+MkV4dGVuZGVkVmFsaWRhdGlvblNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMIIB
+fQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdgCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb
+37jjd80OyA3cEAAAAU2zMexDAAAEAwBHMEUCIQCyyjRA7KCuCu6cS5NORAEY49KK
+9w2Q0NJpfZN8CLUgEQIgUYRKKcnYBMEYarYAVLotMG2iRRALkz3WZZTwwP8mEnoA
+dgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAU2zMewxAAAEAwBH
+MEUCIQD0aqh3Oqdf3BzbagkkXKaeJBa7NTlsRMitc1xBeAe49QIgdpQ7gZ/LOjCE
+dagqUDlaPx1e+qLz7uRhKxEkNFguspEAdQBWFAaaL9fC7NP14b1Esj7HRna5vJkR
+XMDvlJhV1onQ3QAAAU2zMe2YAAAEAwBGMEQCIHQauPt4sfTw/bTB6pIPiprDNeBA
+nNhu1/MmUWKr7Hc3AiBGb0vB1w4FHHf1Ny4u55jIafaiwLYx9ljv4eLAV3TaxjAN
+BgkqhkiG9w0BAQsFAAOCAQEAZiTdMOkTfJ/xWOI7WhkhxKcrIEKRDJ8/YSNcKapW
+hBbgkusAkA8VmGXq3jfPHl91x1ei4UGhlfT5NT3VIcR42O/B7f3hX9YlWjsCd6ov
+b9UtpmzrTKwj8L/rSk1FyxpkY+FYdmI30LEk4I5D6qvFbP6PouCM4bdCU7Wzupv9
+yfh+syJZH6UmmHPrvElMtz1uXasR2UN+Vcj70T8siI8SG8MxTW3fTMw3s6EgF8nZ
+JlBClCkL32lcBnmiy96Y0afwQX28fKm0BxO8n86KkRcofaJEI3dC+/SMKnIIqzPf
+svl3XMWQ/VvQVSDEFjiZHOWDKJSxYtqL2mvzXRfEdY74Pw==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/sso.utu.fi.xml b/swamid-interfederations-1.0/sso.utu.fi.xml
deleted file mode 100644
index 7b50bdbc..00000000
--- a/swamid-interfederations-1.0/sso.utu.fi.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
- <mdui:UIInfo>
- <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:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
-BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
-MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
-DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
-aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
-vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
-DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
-YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
-Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
-7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
-+9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
-kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
-by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
-b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
-MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
-cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
-ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
-AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
-AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
-AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
-AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
-ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
-AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
-BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
-AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
-QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
-A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
-m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
-nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
-njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
-5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
-8MIAfW66Oc6zKMOf26tiwK0/jhtn</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://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tuomas</md:GivenName>
- <md:SurName>Honkala</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Petri</md:GivenName>
- <md:SurName>Teraspuro</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Elina</md:GivenName>
- <md:SurName>Toivanen</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml b/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml
deleted file mode 100644
index 4d09729f..00000000
--- a/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://synnefo.sky.deic.dk/astakos/ui/login/shibboleth/">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SLO/SOAP"/>
- <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://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/Artifact" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Synnefo DeIC</md:ServiceName>
- <md:ServiceName xml:lang="da">Synnefo DeIC</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:Company>DeIC</md:Company>
- <md:GivenName>Istvan</md:GivenName>
- <md:SurName>Bernath</md:SurName>
- <md:EmailAddress>isbe@adm.dtu.dk</md:EmailAddress>
- <md:TelephoneNumber>+45 40142359</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/terena.org.xml b/swamid-interfederations-1.0/terena.org.xml
deleted file mode 100644
index 7b64359e..00000000
--- a/swamid-interfederations-1.0/terena.org.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
deleted file mode 100644
index 7e98ca78..00000000
--- a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://tullbommen.arcada.fi/simplesaml/">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">arcada.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEdjCCA16gAwIBAgIRANjPKkKEQJwfMHea3kHeKBAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEwMzAwMDAwMDBaFw0xNjExMDkyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUdHVsbGJvbW1l
-bi5hcmNhZGEuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUB/mi
-pk7Yn/0yQa9rpQ3AMGmR09/45kBJxos6nS9dCbPZ+efy0dNnvcF/hXCbvbnYXHiA
-ZJg1TjBFOJO6jePNplzs8oDWIk5BV/YaWrnKzZnua66m4dfeFIqLXnTrlnR3bBrN
-9GOdSDHdMEuTIntm+2OVnpJUnVLTBsFjqGcnWISsk7DxSWvJJI5cirawQ+RK3yeX
-QSjg/VXpWQYVTahLe938VaZ7LU2cLeNJ0O2ipv5LEXM5mLX7KSbI+/aSOdXi+0Wd
-D7ThYzrjG1cWwIW8YwU1INIZu1wOvzc+r4LyIix4wFaKIoROHiGr/dMbxgz9oOaC
-kaLl2ZdK4OH2h1n/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUYw143pn/Vha8iT1GD6cNUD36ZxYwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHR1bGxib21tZW4uYXJj
-YWRhLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBRld8PJrEUESgRtOrIVYJ9cyPENSki
-Dg5PFCvckLcfo6t0Or6Bfq5T5575x695zuKw6pD7xToO3oadzqgohveIWpN+qyEz
-0uuQahsRq9cRVQfd9SGensZWfem3ujQZXk3sGwd350G7CiCcNJcNtbsb1wUdFPjW
-h0xhzFZPrHiD0hjAfx8nDMIlIdN2wQtok0+XHN2mll05DGLG2CtniIAnHEOVWEyH
-/bbmOj3zhw+kGJza5x7tldQLVsPntuBsvm74rKW+nAGVfyqhgWlB5kcTuVCe33sw
-d0vPK8knVsYNfPg0Ms8UNdm1LuFpkjxWiwJ4y9IFW7zf86tmV+ryxuBy</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Arcada</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Arcada</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Arcada</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Arcada</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Arcada</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Arcada</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.arcada.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.arcada.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.arcada.fi/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Fredrik</md:GivenName>
- <md:SurName>Finnberg</md:SurName>
- <md:EmailAddress>mailto:haka.admin@arcada.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>David</md:GivenName>
- <md:SurName>Sjoberg</md:SurName>
- <md:EmailAddress>mailto:haka@arcada.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Harald</md:GivenName>
- <md:SurName>Hannelius</md:SurName>
- <md:EmailAddress>mailto:haka.technical@arcada.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml
deleted file mode 100644
index 8b7b2688..00000000
--- a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
- <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
- <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
-HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
-ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
-XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
-495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
-DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
-2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
-5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
-cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
-3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
-fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
-k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
-sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
-adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
- <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jozef</md:GivenName>
- <md:SurName>Misutka</md:SurName>
- <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Jozef</md:GivenName>
- <md:SurName>Misutka</md:SurName>
- <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.card.kilroy.eu.xml b/swamid-interfederations-1.0/wayf.card.kilroy.eu.xml
deleted file mode 100644
index 982ad3d1..00000000
--- a/swamid-interfederations-1.0/wayf.card.kilroy.eu.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.card.kilroy.eu/module.php/saml/sp/metadata.php/default-sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">ISIC – Student Verification Service</md:ServiceName>
- <md:ServiceName xml:lang="da">ISIC – Student Verification Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to verify that you are a student</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at verificere at du er studerende</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Webmaster</md:GivenName>
- <md:EmailAddress>jesper@accedo.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index abfb6d40..ceb2e434 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -96,6 +96,7 @@
<shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
<shibmd:Scope regexp="false">msk.dk</shibmd:Scope>
<shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">simac.dk</shibmd:Scope>
<shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/www.emeraldinsight.com.xml b/swamid-interfederations-1.0/www.emeraldinsight.com.xml
deleted file mode 100644
index 07391e53..00000000
--- a/swamid-interfederations-1.0/www.emeraldinsight.com.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
- <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
- <md:Company>Atypon Systems Inc.</md:Company>
- <md:GivenName>SSO-Support</md:GivenName>
- <md:SurName>SSO-Support</md:SurName>
- <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
- <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:Company>Atypon Systems Inc.</md:Company>
- <md:GivenName>SSO-Tech</md:GivenName>
- <md:SurName>SSO-Tech</md:SurName>
- <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
- <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml
index 9e63f017..e0a01f46 100644
--- a/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml
@@ -6,11 +6,11 @@
<mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
<mdui:Description xml:lang="fi">Biolääketieteen Moodle verkkokursseja Nordbiomed ohjelman opiskelijoille</mdui:Description>
<mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
- <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
@@ -20,33 +20,33 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIRANbySfQqDQ9zZ4V2aSBw+r4wDQYJKoZIhvcNAQEFBQAw
-QTELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUdBTkRJIFNBUzEeMBwGA1UEAxMVR2Fu
-ZGkgU3RhbmRhcmQgU1NMIENBMB4XDTE0MDgwODAwMDAwMFoXDTE1MDgwODIzNTk1
-OVowWTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQL
-ExJHYW5kaSBTdGFuZGFyZCBTU0wxFzAVBgNVBAMTDm5vcmRiaW9tZWQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLoUtGc7MKdSOLEwoAY58MFq
-SPgKPpQlfqeDbE18ivhw96/wS7OYWLyMUBM4Wj2fnoXHXDxMF2MQhusRJjfXmzw8
-md0YBoylbajo14cCaen6PjZdD8m9b0KsqtQy8yqa/KWVMuUoM2vonOtBpsML4mP6
-NVhNU0imUDMsfAgnaoG2EfAA190FVX9oybDUaLbK7P9finunX0/mwxfxKYf45klw
-VDDym6rRBuLBOUSD+RAD4LSZ8WbQNC0XyHTk/pgD4odrT3S8knq24Y0SVTJOADW4
-e5lPX2G8Vn0vJXL1MAZdRotM4VY5fvAf76zDD77jca3i6b0qTYFOgYMytL5/5QID
-AQABo4IBvDCCAbgwHwYDVR0jBBgwFoAUtqj/oqgv0KbNS7Fo8+dQEDGneSEwHQYD
-VR0OBBYEFFSU9LIZC5KU6sNdN/eiXnguhT/8MA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBgBgNVHSAE
-WTBXMEsGCysGAQQBsjEBAgIaMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZ2Fu
-ZGkubmV0L2NvbnRyYWN0cy9mci9zc2wvY3BzL3BkZi8wCAYGZ4EMAQIBMDwGA1Ud
-HwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuZ2FuZGkubmV0L0dhbmRpU3RhbmRhcmRT
-U0xDQS5jcmwwagYIKwYBBQUHAQEEXjBcMDcGCCsGAQUFBzAChitodHRwOi8vY3J0
-LmdhbmRpLm5ldC9HYW5kaVN0YW5kYXJkU1NMQ0EuY3J0MCEGCCsGAQUFBzABhhVo
-dHRwOi8vb2NzcC5nYW5kaS5uZXQwLQYDVR0RBCYwJIIObm9yZGJpb21lZC5uZXSC
-End3dy5ub3JkYmlvbWVkLm5ldDANBgkqhkiG9w0BAQUFAAOCAQEADkQ7NDW2rUCc
-1duYsOiBOhzx9DFikpR7ceBqbWicfQPkPNkdeRMeSGyrc1/Laz+1vzmERnD2wNHk
-EwzIvfsGCF8gfELl+Gcef8CzLu8ilEHb+z2hjW1BsBYG6+TlfS1voekeVt8YfBvh
-WkbjgWGxjz+32+RnjiQsFG/acxbLDKAV3iuVMIQY5q9k7yppb+FnwyMOPVoJLDPY
-ZTMTNtz5xmKVfCHGSiyCrKPrHIk5s4JFDyfdLEjuW4oSBB4KM+Ztrkq1hSuE3s9y
-zsy1QQZKFOddPJgZM7PyUaFBCktdndZBXTYoRVTvhrCLr65Sqea89rshZnDa/umD
-CAKgw6g9qQ==</ds:X509Certificate>
+ <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIQTEIjMmXuufcFuvtWfJihPTANBgkqhkiG9w0BAQsFADBf
+MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
+DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
+HhcNMTUwNzE3MDAwMDAwWhcNMTYwODA4MjM1OTU5WjBdMSEwHwYDVQQLExhEb21h
+aW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAsTEkdhbmRpIFN0YW5kYXJkIFNT
+TDEbMBkGA1UEAxMSd3d3Lm5vcmRiaW9tZWQubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAls+xz8egoxxjFCKfIDzdVZHScL48GtfWfBAZafwuIJho
+dTmsbv9N5kbIm1uLh0GH+IuhEoJruOteMTe1m745IE9AoCluQPWzIfVaUjlc74YW
+QwJLHgaw6ZrzCA0ohP5SLHCOPJDv+1xAzlAumHmnsOw4mX7ea10Plot3SqMcO6rI
+zepln15pqPmmuo57X1jkpQREAKW59DqU5h2RecI56mdIgya3doPQxU3+C9dOMdDT
+z9tnp22IgGRnT1gkF8Ydi4QYFK0KDgLXoLWyuZt0V8N/OAjIGI0eEOjzdPup26k3
+WOvq70FzGpduv4FVPVu+fJjG7ifF0UZUh45yAQO2yQIDAQABo4IBtTCCAbEwHwYD
+VR0jBBgwFoAUs5Cn2MmvTs1hPJ98rV1/Qf1pMOowHQYDVR0OBBYEFCvesVl+fDPe
+JpcyFyNxkZ1Pew81MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBLBgNVHSAERDBCMDYGCysGAQQBsjEB
+AgIaMCcwJQYIKwYBBQUHAgEWGWh0dHBzOi8vY3BzLnVzZXJ0cnVzdC5jb20wCAYG
+Z4EMAQIBMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9jcmwudXNlcnRydXN0LmNv
+bS9HYW5kaVN0YW5kYXJkU1NMQ0EyLmNybDBzBggrBgEFBQcBAQRnMGUwPAYIKwYB
+BQUHMAKGMGh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9HYW5kaVN0YW5kYXJkU1NM
+Q0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTAt
+BgNVHREEJjAkghJ3d3cubm9yZGJpb21lZC5uZXSCDm5vcmRiaW9tZWQubmV0MA0G
+CSqGSIb3DQEBCwUAA4IBAQCODf9haiwN3O9XzB9V4MBPPcB0661YbNJo2N6rguEk
+v9JbToStcACbQ3V0xb2yulk/rgw50U7Qd8nJ7FJg60UfXJsPJbhY82JBK2cXBsUR
+aoxFqzTcOzeHsZzkHWCetMuJ3C2U7zJ7zlM5d00CKq4KUMPw4aIWa1ZVZzY6w7fk
+ygsKkxkMt53Bgz+kboZ2Za7f8+mI1WSwOXGZ7JZvA1silbYaWqAOP/Q2p0YTonc/
+cb9svLVNv1dY7g+DHfHECFu9SLjl/htYmWWoUtL/59m+nPGPmDL6I/rjdzGtVGXi
+PbMcpBprCNt05806/04coPb2RbK0VDV5DG00Z/kNoGxR</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index d0fec9bd..ba6fd5b5 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -3,7 +3,6 @@
<xi:include href="swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/2014.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.certh.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.xml"/>
@@ -26,7 +25,6 @@
<xi:include href="swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/abw-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml"/>
@@ -35,7 +33,6 @@
<xi:include href="swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml"/>
@@ -46,7 +43,6 @@
<xi:include href="swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs2prod.aventus.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml"/>
@@ -61,7 +57,6 @@
<xi:include href="swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml"/>
@@ -72,12 +67,6 @@
<xi:include href="swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml"/>
@@ -100,20 +89,12 @@
<xi:include href="swamid-interfederations-2.0/app.goodpractice.net.xml"/>
<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/app.staging.goodpractice.net.xml"/>
<xi:include href="swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml"/>
@@ -125,11 +106,11 @@
<xi:include href="swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.asiaportal.info.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml"/>
@@ -138,7 +119,7 @@
<xi:include href="swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml"/>
<xi:include href="swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml"/>
@@ -153,21 +134,13 @@
<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/bathspa.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml"/>
@@ -182,12 +155,12 @@
<xi:include href="swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml"/>
@@ -259,11 +232,6 @@
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml"/>
@@ -274,9 +242,6 @@
<xi:include href="swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml"/>
<xi:include href="swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml"/>
@@ -290,14 +255,11 @@
<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.furg.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml"/>
@@ -325,7 +287,6 @@
<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/calendar.larpp.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-shibboleth.xml"/>
@@ -333,7 +294,6 @@
<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml"/>
<xi:include href="swamid-interfederations-2.0/cavle.org-shibboleth.xml"/>
@@ -350,6 +310,7 @@
<xi:include href="swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/colaboratorio.redclara.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
@@ -366,14 +327,13 @@
<xi:include href="swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/copaiba.unifesspa.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/coventry.ac.uk-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml"/>
<xi:include href="swamid-interfederations-2.0/crowd.it.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml"/>
@@ -383,7 +343,6 @@
<xi:include href="swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dadotsweb1.essex.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml"/>
@@ -403,20 +362,16 @@
<xi:include href="swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.pf.adidas.com.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.wiseflow.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml"/>
@@ -433,11 +388,9 @@
<xi:include href="swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
@@ -466,7 +419,6 @@
<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml"/>
<xi:include href="swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
@@ -480,32 +432,24 @@
<xi:include href="swamid-interfederations-2.0/e-localcourses.unibo.it.xml"/>
<xi:include href="swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml"/>
<xi:include href="swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml"/>
<xi:include href="swamid-interfederations-2.0/europe-stage.wiseflow.net.xml"/>
<xi:include href="swamid-interfederations-2.0/europe.wiseflow.net.xml"/>
<xi:include href="swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml"/>
@@ -519,7 +463,6 @@
<xi:include href="swamid-interfederations-2.0/federacao.uvanet.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml"/>
@@ -548,12 +491,11 @@
<xi:include href="swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/fed.nusextra.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
@@ -571,17 +513,13 @@
<xi:include href="swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fsso-qa1.springer.com.xml"/>
<xi:include href="swamid-interfederations-2.0/fsso-qa2.springer.com.xml"/>
<xi:include href="swamid-interfederations-2.0/fsso.springer.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml"/>
<xi:include href="swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml"/>
-<xi:include href="swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gcs.simitive.com.xml"/>
<xi:include href="swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml"/>
@@ -595,12 +533,10 @@
<xi:include href="swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/grnetbox.cti.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/groupes-aa.renater.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
<xi:include href="swamid-interfederations-2.0/g-shib.org-shibboleth.xml"/>
@@ -614,20 +550,16 @@
<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml"/>
<xi:include href="swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/heinonline.org-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml"/>
<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml"/>
-<xi:include href="swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hstalks.com-shibboleth.xml"/>
@@ -639,7 +571,6 @@
<xi:include href="swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml"/>
@@ -696,6 +627,7 @@
<xi:include href="swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml"/>
@@ -715,6 +647,7 @@
<xi:include href="swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml"/>
@@ -762,7 +695,6 @@
<xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml"/>
@@ -780,7 +712,6 @@
<xi:include href="swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml"/>
@@ -820,7 +751,6 @@
<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cyceron.fr-8443-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml"/>
@@ -828,6 +758,7 @@
<xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml"/>
@@ -949,6 +880,7 @@
<xi:include href="swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml"/>
@@ -1021,7 +953,6 @@
<xi:include href="swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml"/>
@@ -1057,8 +988,6 @@
<xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml"/>
@@ -1067,6 +996,7 @@
<xi:include href="swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml"/>
@@ -1143,7 +1073,6 @@
<xi:include href="swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml"/>
@@ -1183,7 +1112,6 @@
<xi:include href="swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml"/>
@@ -1206,8 +1134,8 @@
<xi:include href="swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
@@ -1282,6 +1210,7 @@
<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml"/>
@@ -1304,7 +1233,6 @@
<xi:include href="swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
<xi:include href="swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml"/>
@@ -1317,40 +1245,22 @@
<xi:include href="swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml"/>
-<xi:include href="swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml"/>
@@ -1368,7 +1278,6 @@
<xi:include href="swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml"/>
@@ -1381,7 +1290,6 @@
<xi:include href="swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
@@ -1425,7 +1333,7 @@
<xi:include href="swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ou.nl-oam-fed.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/login.talisaspire.com-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml"/>
@@ -1442,22 +1350,18 @@
<xi:include href="swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/lse.ac.uk-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lumii-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml"/>
<xi:include href="swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml"/>
@@ -1467,31 +1371,25 @@
<xi:include href="swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml"/>
<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
<xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
@@ -1510,13 +1408,8 @@
<xi:include href="swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml"/>
<xi:include href="swamid-interfederations-2.0/o-las.net-simplesaml.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/online.statref.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml"/>
@@ -1531,28 +1424,17 @@
<xi:include href="swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ousu.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford.saasiteu.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml"/>
@@ -1568,7 +1450,6 @@
<xi:include href="swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml"/>
@@ -1578,6 +1459,7 @@
<xi:include href="swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml"/>
@@ -1598,16 +1480,13 @@
<xi:include href="swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml"/>
<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml"/>
@@ -1635,7 +1514,6 @@
<xi:include href="swamid-interfederations-2.0/saml.edusafe.nordu.net.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.psui.geant.net.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml"/>
@@ -1643,16 +1521,9 @@
<xi:include href="swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml"/>
<xi:include href="swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
@@ -1664,7 +1535,6 @@
<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-search.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.huygens.knaw.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.nature.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml"/>
@@ -1672,7 +1542,6 @@
<xi:include href="swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml"/>
<xi:include href="swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml"/>
<xi:include href="swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml"/>
@@ -1687,7 +1556,6 @@
<xi:include href="swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml"/>
@@ -1701,6 +1569,7 @@
<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml"/>
@@ -1710,7 +1579,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml"/>
@@ -1722,7 +1590,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml"/>
@@ -1749,7 +1616,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml"/>
@@ -1790,7 +1656,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml"/>
@@ -1798,6 +1663,7 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
@@ -1818,6 +1684,7 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml"/>
@@ -1855,7 +1722,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml"/>
@@ -1871,9 +1737,7 @@
<xi:include href="swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml"/>
@@ -1913,7 +1777,6 @@
<xi:include href="swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-sp.mediacore.tv.xml"/>
@@ -1927,6 +1790,7 @@
<xi:include href="swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml"/>
@@ -1956,11 +1820,7 @@
<xi:include href="swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/soasunion.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/software.msdnaa.dk-.xml"/>
-<xi:include href="swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/solutions.sciquest.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml"/>
@@ -1987,7 +1847,6 @@
<xi:include href="swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml"/>
@@ -1996,7 +1855,6 @@
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml"/>
@@ -2009,10 +1867,7 @@
<xi:include href="swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml"/>
<xi:include href="swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.sae.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml"/>
@@ -2042,9 +1897,7 @@
<xi:include href="swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml"/>
@@ -2068,8 +1921,6 @@
<xi:include href="swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.eur.nl-opensso.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.han.nl-ssp.xml"/>
@@ -2080,9 +1931,7 @@
<xi:include href="swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.saxion.nl-opensso.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml"/>
@@ -2099,14 +1948,12 @@
<xi:include href="swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml"/>
<xi:include href="swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml"/>
@@ -2126,7 +1973,6 @@
<xi:include href="swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
@@ -2141,13 +1987,10 @@
<xi:include href="swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/terena.org-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml"/>
@@ -2168,7 +2011,6 @@
<xi:include href="swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/test.rpharms.com-entity.xml"/>
@@ -2185,19 +2027,12 @@
<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml"/>
<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml"/>
@@ -2205,7 +2040,6 @@
<xi:include href="swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml"/>
<xi:include href="swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml"/>
@@ -2216,7 +2050,6 @@
<xi:include href="swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml"/>
@@ -2235,7 +2068,6 @@
<xi:include href="swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-fi-fer.hubhn02-1.0.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
@@ -2245,7 +2077,6 @@
<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml"/>
@@ -2297,13 +2128,11 @@
<xi:include href="swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml"/>
-<xi:include href="swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml"/>
@@ -2311,17 +2140,14 @@
<xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml"/>
@@ -2332,10 +2158,7 @@
<xi:include href="swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.123library.org-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www2.foodle.cz-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.2simple.com-shibboleth.xml"/>
@@ -2354,8 +2177,6 @@
<xi:include href="swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.bioone.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml"/>
@@ -2369,7 +2190,6 @@
<xi:include href="swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml"/>
@@ -2393,7 +2213,6 @@
<xi:include href="swamid-interfederations-2.0/www.digitaltheatreplus.com.xml"/>
<xi:include href="swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml"/>
@@ -2426,13 +2245,11 @@
<xi:include href="swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.j2e.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jospt.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jove.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jstor.org-shibboleth.xml"/>
@@ -2445,11 +2262,9 @@
<xi:include href="swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.k-int.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.klarro.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml"/>
@@ -2469,9 +2284,9 @@
<xi:include href="swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nejm.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml"/>
@@ -2485,16 +2300,13 @@
<xi:include href="swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.qoam.eu-.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml"/>
@@ -2517,7 +2329,6 @@
<xi:include href="swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml"/>
@@ -2529,15 +2340,9 @@
<xi:include href="swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml"/>
@@ -2546,11 +2351,9 @@
<xi:include href="swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml"/>
@@ -2579,15 +2382,11 @@
<xi:include href="swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml"/>
diff --git a/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml
deleted file mode 100644
index 7962aaa9..00000000
--- a/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://44new-primo.hosted.exlibrisgroup.com/shibboleth">
- <!--
- This is a "Primo Resource Discovery at Newcastle University" Shibboleth SP for Ex Libris (UK) Limited.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-07T11:11:38Z">
- <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://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
- <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNjCCAh6gAwIBAgIJAIdGru6Iz9m0MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
- BAMTJWRjMDN2ZzAwMjJldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
- OTAxMTIyMTEzWhcNMjEwODI5MTIyMTEzWjAwMS4wLAYDVQQDEyVkYzAzdmcwMDIy
- ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAuZcRSbYJXYqvCMDcsN1NvvfB37VY156cSBF8FUKYdu1yco+G
- 534wiphhYFRsnkDnUuAP9yQED27E/rGfdWrQ3OhkDViuEkKxWhzqYSzopxe/5y6i
- 4oNFORY6HpbdrqF21IZc8bfspS7uz6oOET6V1hYIhd3V5nOTB5VyO1CdKd7o65wr
- CTGj2rzKDXb4uj0HKST3aRLK26jlER5x9uR68RW4nUM45/vmHRgyqfKd+pVMPld2
- TCGDh/jmFvjyHlzZf6jXMgVAgDUAvFXWgCxPo2fuOqlWpVJTalj3CK7uuEx6+SUk
- I3g+FyUC5sJGMTEOwFgKjhOECeYU8+5a/zqnFwIDAQABo1MwUTAwBgNVHREEKTAn
- giVkYzAzdmcwMDIyZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
- BBQPC+IZUQn+WJezFAf2U7VnfAJiKjANBgkqhkiG9w0BAQUFAAOCAQEAbK7NgNnG
- T3qgmYt+4otVR0DBCGlsj50HFvNb4C4uWOEWREUZ9Bb3Ju7E49zMRzf96HpWZneS
- cfaUQrhYl1n8grNGdy8O0PXffSkqr0d9FfaT3IkuIQSqy6mi198brqgVeyNR5BjR
- bi3OGv48vQdkPhzzTR5/H5/mi4U0i54sSI8GFkcRjytrqS1eqdHDRVFkdXbaKsaU
- o+p64ZHxRlqxaFsieCz+5CdiqP9pJwHX3ghS40QMYAMP+P43YJmSlc9FnseWulik
- 1k3+idQuyryJBp0mPLCliosixjLmjXoRRDUJT8uu6J1kDnzQj3Hiub7Ag5Noo05F
- IRUjVAaivivDPg==
- </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://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Benoit</GivenName>
- <SurName>Ginestet</SurName>
- <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Benoit</GivenName>
- <SurName>Ginestet</SurName>
- <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 49e6455d..00000000
--- a/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.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://ablation.oucs.ox.ac.uk/shibboleth-sp">
- <!--
- This is a "Test" Shibboleth SP for the University of Oxford.
- -->
- <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>
- MIIDNzCCAh+gAwIBAgIJAL+QQg4gKHSjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFmFibGF0aW9uLm91Y3Mub3guYWMudWswHhcNMTIwMTIzMTQ0NTIwWhcNMjIw
- MTIwMTQ0NTIwWjAhMR8wHQYDVQQDExZhYmxhdGlvbi5vdWNzLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnz+8H7tA8WPyMdvx5M8mvPiw
- 8tsXvb9wXpMJ7ytRr4E+Mfw0x4V4Ze3Vlqpbl86GPPZ1UsaRt5BXPJc0+3CYE0iZ
- Cwji3tB4j4a9mBEgIgDXfepSkhxrFIV55eV5NxiPaoZdn4r3HtcZ+UPViYeha0Sb
- sQtp8qSYN1N7ro6XvGmPsRaMxciOgTHYuS1l1mATzicO2j1K1vAIPOwJY+64VCmm
- aVEZIzZvbhbfs/UxjJ0QYL5OIakvh2NwPuJYxomPbPTJ7d8dkjQLKVLqeaBXZVd/
- vRUUBN4JRiWqjCe/ydJI1PyPJx797uJQGcWY+Xc014uPzP6UKumQPvSUWKmDpwID
- AQABo3IwcDBPBgNVHREESDBGghZhYmxhdGlvbi5vdWNzLm94LmFjLnVrhixodHRw
- czovL2FibGF0aW9uLm91Y3Mub3guYWMudWsvc2hpYmJvbGV0aC1zcDAdBgNVHQ4E
- FgQUWCsKQqfiwjR0/+IitEXa1hrQ9rIwDQYJKoZIhvcNAQEFBQADggEBAAh41Pwr
- gIEJw5kIsm+8WEPol3+pS/wK2XZ8aDB07uwY39hoQJiBU9pY5YEBrNkbI6JpoHj7
- SYXK/onH9mugafKVn0NX3uuHnFNIRfBP34CSJHWlfKvYU2sdWUmdZ0g7Es82O/U6
- Md4CwQK9TN999XdFTGx8b+/cEzLYquAVHPq5+jRGwqlPbqZlBLz1GCzvWGpkmVcs
- 2fu4xbqDRoJCy+NB/fXg8O/0uiyIQexeGG5A76JDCGOLw988AwKkoykd1iIwrvhv
- VLSRfMpjr+kLRRDFcKnLS0QzDd4ijKMiCnfKYJUzy49x8FUDH+P41uLKDxVB7Ep0
- TZGHmnZDf5qYsqk=
- </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://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Test SP 1.3</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Services IAM Team</GivenName>
- <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Services IAM Team</GivenName>
- <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fd87d7ee..00000000
--- a/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.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://access.sant.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-08-16T15:23:12Z"/>
- </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://access.sant.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLDCCAhSgAwIBAgIJANvcUw2O9TNGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGFjY2Vzcy5zYW50Lm94LmFjLnVrMB4XDTEzMDgxNjEwMTE0NloXDTIzMDgx
- NDEwMTE0NlowHzEdMBsGA1UEAxMUYWNjZXNzLnNhbnQub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8k37VXOb/igIX3TqAUobawXKN4wUo
- cVcXuIFPkHw1jzOEGGESVIIHuPf+mo2lzGtxm+Kf+81knq/DpW8umDVLfvCBvTWi
- 3n4Qw35+a/cjPBszryWveZHvf5h2qFJk0KzjZpJ/QyA7toE9Gyc2WJ5CeHpSZZ5F
- oPMjagFRbjnR49o+P9dkK607UYXZrz7XWRN+c2Yoqz1Q5TsClsr3HT1qz1ot4WpK
- WiA3LNmgTVhgbm06zBaVi8y8szX9fbN0vji+Pr6I/EHrYkh2tJ6TXCiKdGGoO+LE
- yZJ7zn6aI6F7lu9JCbmDd/VmG/AwDj24cZznDkRqSbxQ+JideHuXVf3FAgMBAAGj
- azBpMEgGA1UdEQRBMD+CFGFjY2Vzcy5zYW50Lm94LmFjLnVrhidodHRwczovL2Fj
- Y2Vzcy5zYW50Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFGFeAxbCijMU
- 19VYtZMdljIy+tedMA0GCSqGSIb3DQEBBQUAA4IBAQChVmsTgMZUkNrCV/JUVlPH
- lZmbHqbc0hWh2YrWT/qCo+Ct/cwaQp/OaLQ9oLQk05JEUBxK+RN2/6orVEpOBxvP
- 75f9G/7dMvshoXIMeJkudKkoaYFJh4yszHMRPCXOqDNp0BiGnQhedXOd0onD0leV
- j44Q8kW9yOB8sgNBfQW0cIMtcz2SYcUlITeNfQrHibqHpjzLULDAtaQSekU1lYW0
- wPHLRtw00ncAVwiZN8LcZUglmMucv82zPkMRBnlTn8ctkvBPEe9RXiw9CEXt1XB7
- 0G31ZiVCVRY5N6kENKrC4emYwjwGTJEIAWNZk0+/BH7bO429hQNFenhvhTgonegF
- </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://access.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, St Antony's College NAC</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>St Antony's College IT Support</GivenName>
- <EmailAddress>mailto:it-support@sant.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Christopher</GivenName>
- <SurName>Hoskin</SurName>
- <EmailAddress>mailto:christopher.hoskin@sant.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml
deleted file mode 100644
index 433d44ec..00000000
--- a/swamid-interfederations-2.0/adfs.myhz.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://adfs.myhz.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-22T16: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">HZ University of Applied Sciences</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">HZ University of Applied Sciences</mdui:DisplayName>
- <mdui:Description xml:lang="nl">HZ University of Applied Sciences</mdui:Description>
- <mdui:Description xml:lang="en">HZ University of Applied Sciences</mdui:Description>
- <mdui:Logo height="30" width="108">https://static.surfconext.nl/media/idp/hzeeland.png</mdui:Logo>
- <mdui:Keywords xml:lang="nl">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
- <mdui:Keywords xml:lang="en">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</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/805bc855e60e47bef36a3d88b684f623"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">HZ University of Applied Sciences</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">HZ University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://hz.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/adfs2prod.aventus.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs2prod.aventus.nl-adfs-services-trust.xml
deleted file mode 100644
index e9f21497..00000000
--- a/swamid-interfederations-2.0/adfs2prod.aventus.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://adfs2prod.aventus.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-24T12: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">ROC Aventus</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">ROC Aventus</mdui:DisplayName>
- <mdui:Description xml:lang="nl">ROC Aventus</mdui:Description>
- <mdui:Description xml:lang="en">ROC Aventus</mdui:Description>
- <mdui:Logo height="33" width="108">https://static.surfconext.nl/media/idp/aventus.png</mdui:Logo>
- <mdui:Keywords xml:lang="nl">ROC Aventus MBO</mdui:Keywords>
- <mdui:Keywords xml:lang="en">ROC Aventus 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/6d2b9e04e943f721ccde0f28862cec4c"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">ROC Aventus</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">ROC Aventus</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/adss-dev.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index be299f1c..00000000
--- a/swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss-dev.ox.ac.uk/shibboleth">
- <!--
- This is a "Development ADSS site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T12:02:19Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJALRbL0SFoPlaMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWFkc3MtZGV2Lm94LmFjLnVrMB4XDTEzMDkwNjA1MTUzMVoXDTIzMDkwNDA1
- MTUzMVowHDEaMBgGA1UEAxMRYWRzcy1kZXYub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCuQ0pIlwNnrPL+HVvbWT2UQER/zvq7pmk06hz2
- 0LN1db0xAcMSjM25TMDk7HyCMRF9ccJh6TOPiHJMoWo9cTwkIWS5SMHEvwDXoSlT
- yTMSNnlDvur/DUrzCUe5MHRwRcVPZK5Y+sZ8CFA6Ce0wMsdmbnibV/ENv/LGLHDj
- iuoY28nn95SHAcbWFluckH6mx1WN+nba396qXfU4T9cH3kwNAjcltO4vN4OK1jX4
- GCUVyrMtpcoqIPvUOZkGCq5oNQQMTKv1E7eDhhqk/Fd8wtfaYiZLhZZ4yLfEMOnl
- xHzdWZHrMSWASKD78O5XBy2yHqsoZezZA1rpRuTCbUPyi3B/AgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWFkc3MtZGV2Lm94LmFjLnVrMB0GA1UdDgQWBBRRqlphIc05j1bl
- Jyp9PhFAS9c3KDANBgkqhkiG9w0BAQUFAAOCAQEAl5wymOP4JlgSCsa9JlkMvHRl
- smc44HBXFPXfc4Tu1wDrkoWVxc0fQN0uF/U02AumJA7uDlENcGJ+/NHKBIA6m0wM
- kLKaebcdxB/LBpPV2rYqfpbCklGZ9Tq09QTzPqZiiTwxbDennlcajal78OkTizdV
- o7pu6V9WbjiAoAoyjGl3ab+YsZXw382uG2kH79JVgc+i8Mezx1lFCVvn7aoLGFdf
- BcA77aH4dkhHyffN7L86jVDiZQ0RcfnsC34+vtvAcbt6+TFDDSCpANO1tOvoLirT
- Z9iObgHErexwXys19e20DiNVrI9DE/xKHWZfIATT4J2DUMICKHJjqbdpOE7K4w==
- </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://adss-dev.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford development ADSS site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d4bd639d..00000000
--- a/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss-tmp.ox.ac.uk/shibboleth">
- <!--
- This is an "ADSS Temporary Environment" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-14T13:53:48Z">
- <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://adss-tmp.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJALGFNW/JEWeXMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWFkc3MtdG1wLm94LmFjLnVrMB4XDTE0MDgwNjE0MjU0NloXDTI0MDgwMzE0
- MjU0NlowHDEaMBgGA1UEAxMRYWRzcy10bXAub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCzt7iOu1lzJd5ltK+P6HyoJ9alCZnHvLhwxcFq
- xrKG7/lSfhFsapOTrv+BO31HFx1TSJ+JhnjjZwS6FnIG6fadfU16TIiGkqxUHO4m
- /bdqpQDtCa0cgBH6wUzUq1ErZgOswoOnatg3axFSUKQ0KEU6OSmhscH30Yvzd/OL
- If8cD43EDmB55h34cAIZxIYb6mtWAKhun21+Qcxwh1pqVHT2dTdt1X0gmgUzUQ2d
- 58nezP2XkNJ5wbyl4onuZgVu1bwzqR3JjzHaCzRLS5aWdmit0DToRBgaMVKYPOqm
- GN6mqJrvOZMhadp82C0UAYBtSZ+AqU/03frpmLUXvBtr52b9AgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWFkc3MtdG1wLm94LmFjLnVrMB0GA1UdDgQWBBTf3EmuVSQjziD+
- xl5znVbeA/b0EjANBgkqhkiG9w0BAQUFAAOCAQEAlwc9kHzQGhlBJtoST9UtlIS8
- K4vZ7Sg/SLJYb59AkDHGu748k6s3IDGpjr6sbm+Td4WcvyDQOPfszraIIgcA1Fa8
- YaLMwCVYRgD4dakLdQ6jh6RkZ45jEBGZwyx2itwmVzYI8S4jJ6nlIaOqsKeW78wV
- gA8keRddbVG5zr2LDEzeWKNafqtkr9O1KACtGmMIG279aOVuMgNrmCT9RKwMRFAT
- DyE4qiQqxUS32OHcB0vGKx0qPbSRMbrqdMNtkfWR3e/lVDGkX0QfgX2+ryu7UaVH
- DVEWEa+6dxT8M8Bs1Bfw0K1QCqDMt5/r2wZ/xc8nChb6cVuojFF/JzXiUbi9dA==
- </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://adss-tmp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ADSS Temporary Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d1ba8910..00000000
--- a/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss-uat.ox.ac.uk/shibboleth">
- <!--
- This is an "ADSS UAT site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T10:23:58Z">
- <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://adss-uat.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJALQdi5XV31KTMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWFkc3MtdWF0Lm94LmFjLnVrMB4XDTEzMDkxMTA3MTQzNloXDTIzMDkwOTA3
- MTQzNlowHDEaMBgGA1UEAxMRYWRzcy11YXQub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC6Be+SE7LxJuoJxu2sflorJFlkT4xKn1zo2PMv
- cIDzeVYNmFGlPNCzF0ZRLMOfAgRuNwN1H3rToOo2P5+tQXxEAAkfe0h3aYd1OSEs
- m0IrqeEZbXzZZyNRpxxTbszzH930Hs0YBCp7X2PlFR9eNeNWeMDddxzWf0iN3Mzl
- rAB/bpQi0EpPJcr+wg7kNOe1RUI34lbig6bIABEEEIACmn4M8wXbJdIjtHvaaLGk
- qVeN43D2tdQnzJHVq+iqZ5JbVjQZwUnwlycCV92v16mcdRCTjievh8cdTexdEsbr
- CouifcNlSC6sTjCRs9wffik+QVbJ9cZLy+Vswwts3HaBMmU/AgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWFkc3MtdWF0Lm94LmFjLnVrMB0GA1UdDgQWBBQdCm5MOKCVW4e3
- lBzfalXj1sFx7DANBgkqhkiG9w0BAQUFAAOCAQEAOCEvxqL0Nn+YCabdtyak0EUK
- zKYIdL5jkC8cmtpVzXDasIlMjh1Dm5HcKEZ6z4EXykT7Sg5CK3f3eyDO3mRQRbML
- A0KSM7BG72WDtuyitJfT5huXgmt90B1qLXRdWb0WGnaempYecUPzLPV8Zbbup/cE
- XLppYAJLYiLwm4VicU/+LbTigqgZtCEnKKUGPuINpo6RWKUd9LaO4bgY2+lJMnlx
- oQtr3QoYpiepE/o5B7+K817qhjgyxbGdgUZQCyASoxdxpompcxTSe4XZtDfDFwcc
- dPZXapVZvweV4/6LaDqp8pqL6M/7gLIhqC7gk5GT6h1//0JLGDYtIGlyPlBIZw==
- </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://adss-uat.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ADSS UAT site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ae547395..00000000
--- a/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss.uas.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2.1 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEbDCCA1SgAwIBAgIJAMHhwKmD2myoMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxFDASBgNVBAsTC0lUIFNlcnZp
- Y2VzMRowGAYDVQQDExFhZHNzLnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYg
- b3BzLXRlYW1AbWFpbGxpc3QuYWRtaW4ub3guYWMudWswHhcNMTIwODMxMDgyNjUw
- WhcNMjIwODI5MDgyNjUwWjCBtjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
- ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
- T3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEaMBgGA1UEAxMRYWRzcy51YXMu
- b3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWlu
- Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Uq21vQR
- aGkM8BRh+Rm2G6yIDXfg/u3+LFY0yLaN8CFI6Ke4vd5NB8FjKTLDqkCo7vOUIBxr
- mSYGtmzI3xMj45nk5meFCF2DFPWW9Ahl2Eoiyf14H7dDljG5jvNNUqUBg2uUGd0s
- +rkExZJOsVHcYOYk30pLR2RdRph2JpHR2hMpG5sMTx0wIPN/sphfYejYy8nDXmeI
- TUmAh1fPbTw+lqhGiP3u1KEub1H8POW61pXHijTR8+vZhig58iJDCeAGIMt1Ohz+
- fHY3PGWNyOSberjWmOfbRBPIFbsBZhgZCX5aUg51XJNL3MMmkcdwoueLX5JWniCd
- rC+a/hUJzAd4JwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
- cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8GLgsgMbSHPL
- 7InagZMCUhfRxhUwHwYDVR0jBBgwFoAU8GLgsgMbSHPL7InagZMCUhfRxhUwDQYJ
- KoZIhvcNAQEFBQADggEBAEfQGtUoP+adGHM14S7luh/rS8tIXpZIwt5apYwsZRmn
- e1f12TeRm2U4kJeWa+tbpWZpHT8AyQ1MA83FZzpB+1sisRof5ef6MloOdPpFstBu
- TZQQMT+BRbIDF5jGqd0CjGxjXk4EkzNINiyNR/luSPBILATUrukjlm0K6AnvXCK5
- Jqv6VzqE7r9SANzaf6EzToudGI4lenAJK6QlFfkiT3ikcAf/wxjN+/KKk1FIupv1
- +eaxb/3JNQCm9e3jWJQKuwGYS42TwD6nynJvZMNx4HbDTnHdnoFnRxshT8Lcj4Ux
- Es1CiT3smbVVyekIg2yBRtwdwCM2CrOjlPKCYgxrMa4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: ADSS Live System</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ops</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fb7204dc..00000000
--- a/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.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://app.ords.ox.ac.uk/shibboleth">
- <!--
- This is an "ORDS" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:07:07Z">
- <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://app.ords.ox.ac.uk/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://app.ords.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIDCCAgigAwIBAgIJAKkU7zta8ElbMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWFwcC5vcmRzLm94LmFjLnVrMB4XDTE0MDIyMDE2MTQxOFoXDTI0MDIxODE2
- MTQxOFowHDEaMBgGA1UEAxMRYXBwLm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDDJ+JzjD6rjHcjcHKlnGrYgYMBQ6XWsexSpLsD
- QHGM2ytN0W0N/66dpBdiQwkWT7NqQcYgppAujj9xkdthnJpdcIkZTvh+nQE/mo97
- enuLw23CXn3Rf4Hf+q0Emyoxnx7VSTD30J236PpWHVFSIqO0+DlLf4KlnA7Tsx1B
- W1c92c2aGKGStcVQbI7JXL4MS8txtBqdX0EBEzSMPBWITXlF7QvU4yIPJS4WVGGQ
- w1jQpQMBS7WjSemb1CxDo4uMf5W91ZEPp/R4kqSINKaoYgwRoflkRBlPu7FhUee2
- A7NZ1DylUDQHV05Xw81OWVexAWfcCE1qc2NDGIa//TNyabfzAgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEWFwcC5vcmRzLm94LmFjLnVrhiRodHRwczovL2FwcC5vcmRzLm94
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFFUctzCOP26SDJjvHgRJGCVCXthI
- MA0GCSqGSIb3DQEBBQUAA4IBAQANWQ8NRS5C2+KUz3Kwb9+43AWUc9RFQdY62c35
- cEomG8mBQhQdoNkVZ06g0uHXT94v/CUYYmcTY82HbQZ0ikJGiJODhWb9GVVFSTvS
- HpS/NB9SqC2JwDsr9hGpdeSdK/cA14OtX+WUKZ0MlV3LuSJmH/tiGGZTpUU6YuAm
- z0L3A3KcMl78xql30Fct61ciwZmyK5m7FpWFGu2qoPf9HkrSLSp03wstNdkBoFHK
- HCU9m4vQ6uSSzCK0xlcYJ+WFq4mZb0gtRwzDCUtqYNWAFNggwKyYVgGZ4yV4b35Q
- CTdb2siIqxI2D7KVX71agcKqUXJNnAdCZE5GKTBh1Lpccng7
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ORDS</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml b/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml
deleted file mode 100644
index 720737c2..00000000
--- a/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apps.cricksoft.com/shibboleth">
- <!--
- This is a Shibboleth 2 SP for Crick Software Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJANY32/xM/DNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHNwLmNyaWNrc29mdC5jb20wHhcNMTAxMDE0MTE1MDQ2WhcNMjAxMDExMTE1
- MDQ2WjAbMRkwFwYDVQQDExBzcC5jcmlja3NvZnQuY29tMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAy4siLJ0xVcbDfbaFp/RWcva+0Yvrya3xakCBjK6h
- c6hJ5l0iyoIZPXMNtHARMD1i8fmqJrNilD8AqX7izQcrBGTkLgtkVCOcepf1YdkM
- 3ZQZp+Wb2GIPXBpQWVNy62LPkHLL3LsX3SWiBP7kahZsazgXedgc+6anBnGQDho5
- +od8Z+eeImTXw8JSQNpBa54T3UPFhnBE1h5hBVHZwdx3a57ejtf8oFymACHIFH+x
- 8soJDMlHyFPVu8GrhnxV4agrY36nxKZI5x0nS1tzXtEwzi4KmrWF78/XTbhBty7k
- ocico+7Kj69Zazd0Px3L9ryHWevVF85sjX9SN4sQ4ccGnwIDAQABoz4wPDAbBgNV
- HREEFDASghBzcC5jcmlja3NvZnQuY29tMB0GA1UdDgQWBBQ7Ph7OK0o3dQvZ+Xeg
- jApzpz8CETANBgkqhkiG9w0BAQUFAAOCAQEAyAWqdVobl3x1fg7DZjOJGvKe8QVS
- 9tQBcYUIXROpPJmG27vAfeeaXMK2gGyD9ZlOuTmtHxeI+WRypyKJ1vovDZ1W90WD
- Sin6sfJLyPC9WTgd/D2RbW4FiTkN01HaGupbWSVBzSsRZzqpUlB9eoM7pg5V/dMg
- Zxyd/XYpfrX+tBEpSqioDxQPEZwcVkOKO4a4OsxtTg4UgOTDJT/lU6Pml/h5uxcM
- NhU4jlCAvQmYRbbnW8dM7HwfZNdiDVCf9xcWAQd83B96KM2LcttZAxRFhxWyefC9
- +vQzKLPAKu8sxHzuLbbYr0RUXeiQq/hIQIhwpxZRPlJUXB/bpcNvjMGfdg==
- </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>
- MIIC9zCCAd+gAwIBAgIJANY32/xM/DNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHNwLmNyaWNrc29mdC5jb20wHhcNMTAxMDE0MTE1MDQ2WhcNMjAxMDExMTE1
- MDQ2WjAbMRkwFwYDVQQDExBzcC5jcmlja3NvZnQuY29tMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAy4siLJ0xVcbDfbaFp/RWcva+0Yvrya3xakCBjK6h
- c6hJ5l0iyoIZPXMNtHARMD1i8fmqJrNilD8AqX7izQcrBGTkLgtkVCOcepf1YdkM
- 3ZQZp+Wb2GIPXBpQWVNy62LPkHLL3LsX3SWiBP7kahZsazgXedgc+6anBnGQDho5
- +od8Z+eeImTXw8JSQNpBa54T3UPFhnBE1h5hBVHZwdx3a57ejtf8oFymACHIFH+x
- 8soJDMlHyFPVu8GrhnxV4agrY36nxKZI5x0nS1tzXtEwzi4KmrWF78/XTbhBty7k
- ocico+7Kj69Zazd0Px3L9ryHWevVF85sjX9SN4sQ4ccGnwIDAQABoz4wPDAbBgNV
- HREEFDASghBzcC5jcmlja3NvZnQuY29tMB0GA1UdDgQWBBQ7Ph7OK0o3dQvZ+Xeg
- jApzpz8CETANBgkqhkiG9w0BAQUFAAOCAQEAyAWqdVobl3x1fg7DZjOJGvKe8QVS
- 9tQBcYUIXROpPJmG27vAfeeaXMK2gGyD9ZlOuTmtHxeI+WRypyKJ1vovDZ1W90WD
- Sin6sfJLyPC9WTgd/D2RbW4FiTkN01HaGupbWSVBzSsRZzqpUlB9eoM7pg5V/dMg
- Zxyd/XYpfrX+tBEpSqioDxQPEZwcVkOKO4a4OsxtTg4UgOTDJT/lU6Pml/h5uxcM
- NhU4jlCAvQmYRbbnW8dM7HwfZNdiDVCf9xcWAQd83B96KM2LcttZAxRFhxWyefC9
- +vQzKLPAKu8sxHzuLbbYr0RUXeiQq/hIQIhwpxZRPlJUXB/bpcNvjMGfdg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Crick Software Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Crick Software Ltd</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cricksoft.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andrew</GivenName>
- <SurName>Burt</SurName>
- <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andrew</GivenName>
- <SurName>Burt</SurName>
- <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
deleted file mode 100644
index e10d7cf3..00000000
--- a/swamid-interfederations-2.0/arauto.fapesp.br-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://arauto.fapesp.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">fapesp.br</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
- <mdui:Description xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
- <mdui:Description xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.fapesp.br.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br.br/</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
-NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
-YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
-N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
-sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
-ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
-HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
-SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
-qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
-5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
-xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
-auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
-Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
-xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.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://arauto.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arauto.fapesp.br/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://arauto.fapesp.br/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://arauto.fapesp.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">fapesp.br</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
-NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
-YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
-N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
-sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
-ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
-HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
-SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
-qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
-5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
-xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
-auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
-Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
-xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.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">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.fapesp.br.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.fapesp.br.br/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Leandro Costa</md:SurName>
- <md:EmailAddress>lcosta@fapesp.br</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index fcb55bda..00000000
--- a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://arch2moodle.conted.ox.ac.uk/shibboleth-sp">
- <!--
- This is an "Archive for award bearing courses site" Shibboleth for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-14T17:08:00Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEpjCCA46gAwIBAgIJALdGk/GDLkgoMA0GCSqGSIb3DQEBBQUAMIHTMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNoMm1vb2Rs
- ZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNv
- bnRlZC5veC5hYy51azAeFw0xNDA1MTkxNTQ1MTFaFw0yNDA1MTYxNTQ1MTFaMIHT
- MQswCQYDVQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94
- Zm9yZDEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0Rl
- cGFydG1lbnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNo
- Mm1vb2RsZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5
- bG9yQGNvbnRlZC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
- ggEBAL0OZbHXRsG9wrB70737KdlY8xdaDGvSedBTPKYXIf00B4xMLSXsYov19yTO
- rcPLuVda0rNt85mTrC/M/VD9hlHgzALnJIsApqUprsDzoTS/vClWwNyqOKP4mDWF
- Yqw2nUUekJKrdcHETNptAsmqFcevv/EVCBd6OCNZExNAVYwvZvSDKT92Y0Ou3Nvt
- c4Lxndyq3LQTbXwuB69ctx0SZbHB6MOUD0dFdmH6g22jzuA59M1Gevc0cXXUvw+a
- qGsUTtRN85Q5t0lCs9UvW+9N4nvAHkuR8wnn7/ate0VyPuHrbkSOEoCbVtafkx6c
- /A2SfiYmP5g8aCFSoGHqu3iWhocCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
- hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
- FPXvl+z8qlRh81pc6/+0moo6Uz2NMB8GA1UdIwQYMBaAFPXvl+z8qlRh81pc6/+0
- moo6Uz2NMA0GCSqGSIb3DQEBBQUAA4IBAQAph+BB117ucSrjA4bg1DjzeQYwMmgS
- ndz5kQXqgTyafXs/3sSBNS9g9hKKadzntTLQdoSytzgcEDIhskzl9FkJQN6scq96
- +LmZZjz9CIXyn3dBLOBpP2whuT4V8CetustNdbTMZE2xml0JCmeHL0uy87bQS37S
- v9uevHXdxb1EoZxRZmue4mWPJYfEuT0xSLSLXxah60bgS/t3rBuRXVmOuicxHylM
- Wr9ZuBF0R/9h9gbOS1vyTM9TCrZtA39HBCyDFCt6TH4KNiXX9B9a3cX3a8mADfZI
- eouxo4D9OsCnCEJs7ZFa2Hbzcoxi+t2mOKR1BmE2YsOAIqyw4YnpARHv
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Archive for award bearing courses site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 7e238d15..00000000
--- a/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://archive.conted.ox.ac.uk/shibboleth-sp">
- <!--
- This is a "Continuing Education Course Archive Site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-09T07:27:49Z">
- <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>
- <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://archive.conted.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEnjCCA4agAwIBAgIJAKx7Kep4xsyPMA0GCSqGSIb3DQEBBQUAMIHPMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSAwHgYDVQQDDBdhcmNoaXZlLmNv
- bnRlZC5veC5hYy51azEqMCgGCSqGSIb3DQEJARYbbWlrZS50YXlsb3JAY29udGVk
- Lm94LmFjLnVrMB4XDTE0MDUyMDA4MjE1OVoXDTI0MDUxNzA4MjE1OVowgc8xCzAJ
- BgNVBAYTAlVLMRQwEgYDVQQIDAtPeGZvcmRzaGlyZTEPMA0GA1UEBwwGT3hmb3Jk
- MR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9mIE94Zm9yZDEsMCoGA1UECwwjRGVwYXJ0
- bWVudCBmb3IgQ29udGludWluZyBFZHVjYXRpb24xIDAeBgNVBAMMF2FyY2hpdmUu
- Y29udGVkLm94LmFjLnVrMSowKAYJKoZIhvcNAQkBFhttaWtlLnRheWxvckBjb250
- ZWQub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSF//x
- 5ANAQ3e+hcEjYI5af4H49YP+x9SncP2aIATyUuMaZMOEv3VGn2TSDV9+bdSTgxiR
- 2oeSbE3ARkPbLquxCkqDXmZ91A9MP5pvZLdlLdLgE8EjgCCakfqRer/D7cphHvsa
- 9mCIKV0trO3Iqr6ep6X3qiH5x8JZPDEwmV3pQtkvsJ+Th4ErztvJNNvfzksLf72y
- pzgtZEb8xN/YFnVFU1cSl5L3Fb/ZIqSHVvrlJzXPHMtUaep4kVO7i/OBXOUf3yVH
- twAKo5IE+SWB7FJEfdkdbnDDF8qffyULe2+0JIO89ErRYvJx1s1exd25UjD0mK6P
- ZixKiZjWMHrzTZm/AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
- HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSmF6Yw+AaK
- jeX+6wLqozFCa7GJqTAfBgNVHSMEGDAWgBSmF6Yw+AaKjeX+6wLqozFCa7GJqTAN
- BgkqhkiG9w0BAQUFAAOCAQEAuyOKC3Vd4cHf2JniPcmYBnze4y4CAHBEbT5wdnhH
- zxZ1xu/iyz841JYV3OQYm3mNKMtLK5Xy/dPHUJoIXNvx/eH5recFFJ/a8FfrevHG
- onZAMv7uhaiCkwIE/2WKq2awNaX3YXpWSowF3OCX5rWSFMeuoc/3Kv2/VHdFn8ZN
- QCW4Tt5oSPMwq8oHiUy7ohmMdmdUM648K8rZ4PK0Im5iKRU6KZn5tc+Ng/8KhTGE
- mQX2NuTpy4/FEA/Ynn3BjFNHZ7oj8G0agQbpuKha8bSVDfjqLokvksSg0uep/5nS
- dLALrhbv5RJI1uKUJ9RryT0WMZtTQzPPENtmUQXOgSDs3Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Continuing Education Course Archive Site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml b/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
deleted file mode 100644
index e784f56c..00000000
--- a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://archive.guardian.co.uk/shibboleth">
- <!--
- This is a Shibboleth 2 SP for Guardian News & Media Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://archive.guardian.co.uk/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://archive.guardian.co.uk/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://archive.guardian.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDoDCCAogCCQD3vWcl7rNUgDANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
- R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQV
- R3VhcmRpYW4gTmV3cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNz
- aW9uYWwxHzAdBgNVBAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswHhcNMTEwMjAx
- MDkyNjE0WhcNMjEwMTI5MDkyNjE0WjCBkTELMAkGA1UEBhMCR0IxEDAOBgNVBAgT
- B0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQVR3VhcmRpYW4gTmV3
- cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNzaW9uYWwxHzAdBgNV
- BAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
- DwAwggEKAoIBAQClyvCzzPicg89DDrCTdwlSKxxhWkoDdDM/zvQplF33faQHBEX1
- kX+NHiWm7bFsR1EgsZEXN5MShCkxSapGJ/KQNaqWCasBxOnlKPNmnSxg8DUf8Il/
- Er6NDOm7w8mzyr6jKyLLBWSpRM79+aNqlp8mJnrEYEohwcmIjNX9yDhD9MMX4INh
- npBKP3lHpUSEVcvF4l/CEaMHl37l2ipwqc2p9Yb3adKI3m5Mo1HwhIOX+FVMB3H8
- s2wP8rBniNJLqzU61PCzgsj3yu8GuVyTHdy5MkzxsANiFZ5rM9x3MyMK81ddC+/h
- 6s/LPahVKDe8M/Dxpohi8T+245pBzAVmR7udAgMBAAEwDQYJKoZIhvcNAQEFBQAD
- ggEBABK63U1h8B1I3AFeaCir1rQjgvTLqIAwDPSO5O60CoA1Dsa5STjdOQHlWfU6
- 6yk2RMDl79avgQ79dZuKYfOTRgWNFttTe6qXfC7V8iPL1S6ZI5UD/QXNfUFDYnPT
- 2rKjPWOQSvtcFRNIQQEggIJJARCJ+6wmrQdSFdEwTApo1vUMrvewglWoZtOZYZjZ
- 5PqI5ayLcMUj4gYwtt3aTdAa+EeE9upHEvvAVkx4TT9sZzzH6UIFuAOqAdVxoixY
- TYacJZq5++ryJ0ljizbVDyflHYPrnZq/F7FrsTLG0zWvKK+WwOClHU5na5YZIBA4
- nhD5qKnl7TBNTd30v5ddf1XcImY=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Guardian News &amp; Media Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">The Guardian and Observer digital archive</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://archive.guardian.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Lucy</GivenName>
- <SurName>Haire</SurName>
- <EmailAddress>mailto:lucy.haire@guardian.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rupert</GivenName>
- <SurName>Bates</SurName>
- <EmailAddress>mailto:rupert.bates@guardian.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 7a6d8c67..00000000
--- a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ark.biology.ox.ac.uk/shibboleth">
- <!--
- This is a "Departments of Zoology and of Plant Sciences ARK" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-03T11:24:51Z"/>
- </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://ark.biology.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEcjCCA1qgAwIBAgIJALXvZ+na+8FZMA0GCSqGSIb3DQEBBQUAMIG5MQswCQYD
- VQQGEwJnYjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHjAcBgNVBAsTFURlcGFydG1l
- bnQgb2YgWm9vbG9neTEdMBsGA1UEAxMUYXJrLmJpb2xvZ3kub3guYWMudWsxJTAj
- BgkqhkiG9w0BCQEWFndlYm1hc3RlckB6b28ub3guYWMudWswHhcNMTMwNDMwMTgx
- MzMxWhcNMjMwNDI4MTgxMzMxWjCBuTELMAkGA1UEBhMCZ2IxFDASBgNVBAgTC094
- Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkg
- b2YgT3hmb3JkMR4wHAYDVQQLExVEZXBhcnRtZW50IG9mIFpvb2xvZ3kxHTAbBgNV
- BAMTFGFyay5iaW9sb2d5Lm94LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZ3ZWJtYXN0
- ZXJAem9vLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 7Gcag+bauSUOc+oeeS1vWw5TRYdBHCUejlqzl0kLmG0e4Kz/KQNj5+BthkxQKLw6
- Jmpf68Ws3nAcWIz7pDRgiHoBfkjkc5vMbyehtnnW+17JwAuZAbqXcKVyv48qNFJe
- NLKJI2tJ8iJ4wlce96cw7ouBbC1jawNvxlonb9T0D7xn8+XMwRZKJ8Sgbt5cGJFQ
- p1SmCrM6shou3sEcZhwBAPindHCQyyppaabkQlivY1Vka8WiNkxsWCoj5igtLsEb
- VyejLlkDsfp5BYPRRaormViEPyybFKmDTopVkm+xDjLgnMSyK+COYeujtkewx95y
- 29SSoiexAONJV8hqaKGrBQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
- DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUModS
- 2TCZbpR0Xo3EGog6bIgUbvMwHwYDVR0jBBgwFoAUModS2TCZbpR0Xo3EGog6bIgU
- bvMwDQYJKoZIhvcNAQEFBQADggEBAIucTNVYS1EKlXQKiFPO4oscBMSmq+LjwsDI
- 6EKsFCVY8wMnSWx3zU5skfoWjZw69xHFYVfTk+WKMOQ9qmMOFNItuw0wLqghN7w4
- 4gD+NdZAdadAudsPJiVF1cJPsQptU8xyPWSQc1lqJRFmxUo9lKj8Vq9zABM7373M
- M8WeaMj+H+9A0U2dRGEzyJUyRRP1ogYQqc+jC/Qj9nnahqxKsrxu4rnc1Z3d2RMO
- qumcP0hPqD+mCOlr9DnJyLsPYcPK8M964rOfemmeqtBExT9kgX1N5shs/P1c5+Lt
- OHEYDdIFb2iPO4iL4JwvF4kJLIG6C2xz6ABtgHSgR7SANWZMqOU=
- </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://ark.biology.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Departments of Zoology and of Plant Sciences ARK</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.biology.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Department of Zoology IT Office</GivenName>
- <EmailAddress>mailto:support@zoo.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Department of Zoology IT Office</GivenName>
- <EmailAddress>mailto:support@zoo.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 375022e3..00000000
--- a/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://as1.jesus.ox.ac.uk/shibboleth">
- <!--
- This is a "Jesus College meal booking" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-22T13:48:33Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAP1oldxO3zymMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEmFzMS5qZXN1cy5veC5hYy51azAeFw0xNDA5MTExMDEzMTBaFw0yNDA5MDgx
- MDEzMTBaMB0xGzAZBgNVBAMTEmFzMS5qZXN1cy5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAKZcXku3Zc8SySbCvMeljZQV5jypnNoVsKr+
- xJ2aftBX3yEBy+EplJeb8c2zZy6wzDbYqmO44GgKtNnApNl3EACPvLIcs5STrd8E
- /gpSMctx0yhFlt1bNlKXlN7oIlgLIkHxCq+HYOEOtl6jo1iWs+yomqyyDzy6rkBB
- pmcsQOG6k8e+PV6n51gdrjzC2eMYQYx5cVC6BNTPZRQMyROMu8w6j30K9cRnFrLc
- 3zOl2BN/52qmYnjqhuKwHfGiCGa4bJXZTKOyq7vCiy9hPhjE6RAgZ/ou3oifvLfc
- p4LPVKG9jfyYNS2Ujz4AFBZB3CogOqeKXHwlaG6FV/vVufhos9cCAwEAAaNAMD4w
- HQYDVR0RBBYwFIISYXMxLmplc3VzLm94LmFjLnVrMB0GA1UdDgQWBBQIR4e76w+e
- 4xVKYSKirFqZw3OcTDANBgkqhkiG9w0BAQUFAAOCAQEAmaYiU1kGOEi6Kx5l9mWe
- FIsUCQM5QUHu2Yzy5Jo0+Jlom41XOR5vWjrly8bcG/3ztQQ/0gahSFIaXuym2b9o
- /LPSsHklOjB9oHPudlzBkkn1LSiAXE6kjaLEIZg+sTgTyVoo0ZmVa7NsBSF0LTe6
- lWlhmg+eMMKF/RyzZRrS8pGv2HeRSsGXcpUKEZi3ltZkJahMrYGKGl2PgAdIk8Nw
- JP2zMRijGCQPMTx3qNW2kPr6vJyU6FLjsvh4Pe7Iqy3f/I24hLv56yjq2/WnZcRT
- 05XT9RmfWaVoCNvoFqa9gTOmvVqt1dz4HU5QDuxnZ6sxlhc8z15p794mPat3aPmo
- HQ==
- </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://as1.jesus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Jesus College meal booking</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.jesus.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Gerard</GivenName>
- <SurName>Fegan</SurName>
- <EmailAddress>mailto:computing.officer@jesus.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Matthew</GivenName>
- <SurName>Melson</SurName>
- <EmailAddress>mailto:it.manager@jesus.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml
index 06360ad2..1f1c4fe4 100644
--- a/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml
@@ -75,8 +75,13 @@
<EmailAddress>mailto:library@sfx.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Pat</GivenName>
- <SurName>Griffin</SurName>
- <EmailAddress>mailto:p.griffin@sfx.ac.uk</EmailAddress>
+ <GivenName>Thufael</GivenName>
+ <SurName>Islam</SurName>
+ <EmailAddress>mailto:t.islam@sfx.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Daniel</GivenName>
+ <SurName>Pereira</SurName>
+ <EmailAddress>mailto:d.pereira@sfx.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml
deleted file mode 100644
index ce8a306e..00000000
--- a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-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://athens.winchester.ac.uk/oala/metadata">
- <!--
- This is an OpenAthens LA IdP for the University of Winchester.
- -->
- <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-07-08T13:59:39Z"/>
- </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">winchester.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
- CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu
- Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx
- ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo
- ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
- AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U
- ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ
- G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ
- r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH
- KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9
- xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y
- 1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM
- BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe
- +UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8
- 7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n
- owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5
- fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz
- TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9
- </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>
- MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
- CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu
- Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx
- ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo
- ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
- AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U
- ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ
- G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ
- r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH
- KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9
- xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y
- 1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM
- BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe
- +UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8
- 7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n
- owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5
- fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz
- TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.winchester.ac.uk/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.winchester.ac.uk/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Winchester</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Winchester Pilot</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:Helpdesk@winchester.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:Helpdesk@winchester.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-metadata.xml
index 46bafe5e..6b2a42b4 100644
--- a/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss-sup.ox.ac.uk/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://audit01.ncl.ac.uk/shibboleth/metadata">
<!--
- This is an "ADSS support site" Shibboleth SP for the University of Oxford.
+ This an "Network Audit" Shibboleth SP for the University of Newcastle upon Tyne.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,34 +20,34 @@
<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="2014-12-03T11:05:28Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-07T14:29: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://adss-sup.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJAKEmzYEyf7xxMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWFkc3Mtc3VwLm94LmFjLnVrMB4XDTE0MTEyNzEyMjkyMVoXDTI0MTEyNDEy
- MjkyMVowHDEaMBgGA1UEAxMRYWRzcy1zdXAub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDSHfFTxy8aBmmoP8QKlFuozdECVsvolCQRUFps
- dWeBq4LERrj68DTYRT8YDzK5IJ8tHQ4L3eEuOS1399MRV0BqkbjkVwipZPb8gTle
- Ptj4jVsxk2/IshdO2HyRELiIvKV5DPmy059aLA7lx+20V3hQq++nb6GfhmBTQZ/b
- dk9VFMMBfDnKvMjLM2jFUVO/lFSmbp+kkYybNQL6nt//KrQbrXDA3q/nSBXUHIgY
- HD4Oziu946yM0y7awaLOGvlP2yzwGU3KpJdz53Fa4E63wiuG3eZAxz+1esNC1U14
- LSx2RZiglivYkfkBku4X6WrqYiZiHBVsuK/4JVxpUjorBxVRAgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWFkc3Mtc3VwLm94LmFjLnVrMB0GA1UdDgQWBBSDEebTgaTcHS2G
- 70WlBWHcgTCoizANBgkqhkiG9w0BAQUFAAOCAQEAj8hvwebVXE+tNgCiDt5LoyoY
- P075Wguikjxn3vEmkTDcrjTT8K3bo0hTClf0hBHEQqATpR+2L8qbNe5bJSuUYUdV
- /aMv8xwIyjkFF/9yxQTK2gCO8iw4mHWWVLAiu/wq+eidx7WtIO7PvhCO05u6muy3
- nwlvQwyrn5SdmwRv5N2dBUu3iGDZABy47hDNQ1Rgtf+58TU9Cxe1mtEubuJ4k6hh
- a5U4QaC4zu1wkpVeYKNzyRAL19XnE+faYuOuRPrQazh9df8EFKU4i55ZmWGUjQNZ
- cNXil4aUZipFz0PcWQcen8w+6nc1blUDfD+1yYiFQTWaP0ZSICFJZFzMKX6bYQ==
+ MIIC3DCCAcSgAwIBAgIJAK1ZzdLxQXfRMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+ BAMTB2F1ZGl0MDEwHhcNMTUwODA3MDkzMDA1WhcNMjUwODA0MDkzMDA1WjASMRAw
+ DgYDVQQDEwdhdWRpdDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ 5IdZL3vNFHuNz+DGyejDu+UgKY/LPIZFkxhp8b2YC4bRf55rRkq5515WDxPDSCYa
+ wY+4STF7xcMZ5swx/KyZcSoKRH36iMcVY48WJPDMwA2/d21bqj+/s3n5q9rXm0ZN
+ jxVIrv5OQdt9pPtxPgrYTMdjf7TveY6LEQZ/mhjmPpHL5ejvWkTqM53198tMI5KC
+ pkohQXDTdEO9w3euRlQOn4rhFwhStzEynb8V46+H9c2JMpxBU/YETzIvHvNejFk9
+ qjcJO3Ly8FtFJI6zw7vpGyQkqV21uNJd0XUQiE6fBqGPp9qRh3OtJc4UDcnwHuJ8
+ VXAz1UJqNnhOYrmE8ng2iQIDAQABozUwMzASBgNVHREECzAJggdhdWRpdDAxMB0G
+ A1UdDgQWBBQQiotJs1YSybSGq0yt+EI0GCxoOzANBgkqhkiG9w0BAQUFAAOCAQEA
+ 2SW+OOlAkSo32Xbza8q19qaaTT+ZQa7PT6TO6MqyTHUM1tOGOa3Q5/NfCY3krs7+
+ dzoi2Mnbir3hLh5uH3BDWWCmZvXIxzoKqVBCmD/SBRIyhfrciVFCRcdD/D6dU4B+
+ L9h/Ktz9BG5QbOtXlojqjBa+1WLBrUwryLA/EEoBIkrZp819dGHjr1TcaL7P/xC0
+ uR1CJ5dETNrLPNQWP9ttkJMkIrBc+7WjRnNOedg0Ss/MrtDfrLCPh3JJBJZcziHf
+ PPPpfIEpkCXejb/xcNx7oAUxbhr6KSQlHrTR9qm3q/iZ4sf2rwKg4cSPlL351B6L
+ uObHYjETyvZu3iRO6lS2ug==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,30 +61,35 @@
<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://adss-sup.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Staff ADSS support site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
+ <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Newcastle University Network Audit SP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
+ <GivenName>Chris</GivenName>
+ <SurName>Franks</SurName>
+ <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.ac.uk</EmailAddress>
+ <GivenName>Chris</GivenName>
+ <SurName>Franks</SurName>
+ <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
index 71423022..e34d7bb0 100644
--- a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
@@ -20,6 +20,30 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIC+TCCAeGgAwIBAgIJAJmcv9A/+nY6MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMMCHdob2NhcmVzMB4XDTE1MDcyNzA5MjYzNFoXDTI1MDcyNDA5MjYzNFowEzER
+MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDb9zK81GuZJ/4TX0AalLD46F8+lcmfXc3Y5ccE2ZctCXVmeRUcnHXIr4jFJRQ3
+8AJ/g8A8zcsTYuDbhAg7Yd2vqmSSGGf9EETNn45NluBhfdtVTOKTXYyv+aY2RZKV
+iqpWzz5i134rXXy61xLOcC0ci74K8PbwkfviMwYlnNNzFMBRIFOLTTFKgdDtjcE5
+Ie5oZPS4j5Tx0dYC3T2yhCWA7k0kc1VF/7Q9tF2+9msXHkGBMDOWoaKy6QKi6CHK
+viEFYBd5U2PpSWQhqmcIBzIelQ2J3XIcoeyg/85tnN/s0+ZsADjJmzsOFVtAMYqI
+Ry+75rqt+CLhs2RLXEFMkkTzAgMBAAGjUDBOMB0GA1UdDgQWBBRAoB5K4Z/Gm1zk
+WtY9P638mmAeGjAfBgNVHSMEGDAWgBRAoB5K4Z/Gm1zkWtY9P638mmAeGjAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVYVLSftwjAw0CyOcH8QXxjQmm
+I/bQpPnAb6UDktX8zIqDfl3gZNa2oqMARcAgN/hBReqFpWQIUdsaJlePCxnWyxjP
+aF3rWvXt47VoAABO9C3CdB5IoP65+GPbTNUQG0xFvrKFg4/Dw0/LyGf1I92cLl17
+GwtPeH74WWUS3211Vj/I5sgWqxWn7fDCA6uaEUEvFXlM9IVEOFfNhH1X+uJInXvG
+ydZRy1PJDov/EFcatxt2v0DTIuqmtqTKi+luC1Zf5HdqV7d3EH76JeXcrvUGc8sa
+qyA+HoSIue07UW2+enWOYUPVdkGqJ2+aSWgdYiwY825Q+GWXN7qSuOwGIXeg
+ </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>
MIIC+TCCAeGgAwIBAgIJAMZ6vEXbndNaMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCHdob2NhcmVzMB4XDTE1MDMyNDEzMTQzMFoXDTI1MDMyMTEzMTQzMFowEzER
MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -40,30 +64,6 @@ gfR+hAVdryNm7EwlyO/nkqxhil2SSwTWyZi7YLmScmmyefERLhWt3uEtxBep
</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>
- MIIC+TCCAeGgAwIBAgIJAL+BQHJtGb0jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMMCHdob2NhcmVzMB4XDTE1MDIwNDEwMDQzN1oXDTI1MDIwMTEwMDQzN1owEzER
-MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCkZ2KuLbuBdCKcDN9yAR/+RFajz85DENz+F8c7JGEUpUdCl3e8Lz5+QxC1D+rn
-3D4qrYozrsk+NcOa7IqC/sT0cmvWMpRaA/qCXpC4di8z+wsuUT9DSuAQu5XhXgz8
-gHXktqAT/qgmIo29Ofv0hNl1pi+TblnFGS6thfvRlmJ1gLGi9AMVickS7fgijSrq
-xZXYzUV7gqIenvftzyjD1axcHoF38gofLmyIpcTqCNpoJ1gstEJRCfzK+WRnBKlW
-XiDnMMpoupUPM8zU730aB13qY3BftPN1ZigwdVJipe9MGkXF/ZN5v/ofCytzQWCm
-zRBp8eSYKFxjdaDlhfUFBXcxAgMBAAGjUDBOMB0GA1UdDgQWBBSbnTR565qjMG81
-RyVzrUZFBlZYSTAfBgNVHSMEGDAWgBSbnTR565qjMG81RyVzrUZFBlZYSTAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBszIrhKOaT+2nPbOWo61o1FsGL
-K8XWHNs0q1PZUqAqt7TUvOjSmOqwafWVt+fRtN0qh1+8NoLcxVeAHAY0vudPeX+T
-2Sgj8LzDkSl5XssO2f9oUApZFgI2ctL74RpMLoPuhjQxJAv2sMxA52EFbarGLFfa
-7xbnuvP7wIHGbLfk9W8fWC/dJOkSaW0ysDh8ZIrJ7NeeymOxxZg1SnJ7q/51nKIA
-w8KIXJN0uLhGRREKNPFi76EzYueFntZ10zVmIxLcB1stQHt/uFCA8pP8z/7Wlg9k
-w82nDsQe1PSSeiiAhiTWSLTnzMyk7AofMUC2+jxRFaWTUSGZVQpGIbfMeJ/n
- </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://auth.chimie-paristech.fr/idp/saml2/sso"/>
diff --git a/swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml
new file mode 100644
index 00000000..089c4b4e
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.dariah.eu/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-07-31T06:57:48Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://auth.dariah.eu/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">DARIAH Self Service</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">DARIAH Self Service</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Verwaltung von DARIAH-Benutzerdaten Registrierung für DARIAH Services</mdui:Description>
+ <mdui:Description xml:lang="en">DARIAH user data management and registration for DARIAH Services</mdui:Description>
+ <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
+ <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>auth.dariah.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=auth.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGDjCCBPagAwIBAgIHGFSphGu/5zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDEwMDgxMjIwMDVaFw0xOTA3MDky
+MzU5MDBaMIGCMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRcwFQYDVQQDEw5hdXRoLmRhcmlhaC5ldTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANk/Hdv+RUK1bWw3xexSis10w4yC
+TkVez0Jq40TbiF4RSNZ+dE4P0+/Kvlm6kN/iJyxDJ/c1ZNPDBn7iDFwRCWPVx3IF
+QNJE/EkOucCbIqBAOBdZoyChn1OtK78c1oIVuVUxpSgkrdvTeFfWTJTADkaLCA/q
+t+k1v0W2W1nvLGnTlaHpyUmUDXss4ubeTTMg1AvoBorxJkrvGKO9BHH2mLV1jpOt
+68tojuVUOZ91+1TwqkM3gp2nT3v6Fh3lKgd3QrP+ODhqsuPViW7RGyKujtjbBvNd
+RShvTFi6oSl2hKvn7hevy7vCYsYoQ6Jdzp5P0ZwSi4mLNfJ1a2BOv1uh0ZcCAwEA
+AaOCAlkwggJVME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQB
+ga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAdBgNVHQ4EFgQUo4dEl7xc0QyDNe70xOIt3munlrIwHwYDVR0jBBgwFoAUHb1z
+zG3ubhx0cNmjGzq6qCfevOswGQYDVR0RBBIwEIIOYXV0aC5kYXJpYWguZXUwgY8G
+A1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29l
+dHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
+3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5k
+Zm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IB
+AQBxZ/OEFKc5+7YkF8fPzhyWAaeWeG614E4wm3MmT9go4tsxff0adtr5cnb3fC8L
+BI7pBxqMlIIr0M4xkDkT3JlXyY1Kftz+wzNSSRr7+k3U+6/rJjN4x6DpP1ZRXZGf
+MWcgq74X8KrDkSFG+zrMZGQIxE8PhuE3maLgBTeQ/aFJgKdGnRDLpiQgZ9BRhUT9
+69oGlkmJS2PLDwi2mMHLOegp1lklQxwLTj9XXRsb+bWTboeZpT3PQupBuSgBEbRb
+fT9iDrD0x+GZweFkC8bKJtP4BGIbs11tE+cdbxmH0yoEnHevs0z/AbPxPYR/4kj9
+keb+gnNfYWJuJWwjSHeUJ3vL
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">DARIAH Self Service</md:ServiceName>
+ <md:ServiceName xml:lang="en">DARIAH Self Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">Verwaltung von DARIAH-Benutzerdaten Registrierung für DARIAH Services</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">DARIAH user data management and registration for DARIAH Services</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Martin</md:GivenName>
+ <md:SurName>Haase</md:SurName>
+ <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Dariah</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
deleted file mode 100644
index a0e5dc4f..00000000
--- a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.digitaltheatreplus.com">
- <!--
- This is a "Digital Theatre Plus" Shibboleth SP for Digital Theatre.com Limited.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-08T10:45:02Z"/>
- </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://auth.digitaltheatreplus.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://auth.digitaltheatreplus.com/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Logo height="60" width="104">https://www.digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
- <mdui:DisplayName xml:lang="en">Digital Theatre Plus</mdui:DisplayName>
- <mdui:Description xml:lang="en">At the heart of Digital Theatre Plus is the ethos to
- share the best of British theatre with teachers and students all over the
- world.</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSzCCAjOgAwIBAgIJAIF+/2SALpqQMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
- BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
- MB4XDTE1MDMwNTE2NTAzM1oXDTI1MDMwMjE2NTAzM1owNzE1MDMGA1UEAxMsaXAt
- MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUhOG8fAf1z+P4MxfipVuLI7gGaTbn
- XRjaqUcvn3q2RfG7uFflGdgTNPESECxFlRhQB9t8r6kP73HpmlDWAb1cK0iTfbVX
- YzKQRZJZuYyk6dTR8Q+ipKA9VwzWCQC4HtFUxrGJJPqUesLUSxmPjwsjQzOdQPVQ
- jB17OYwNSi5lCehWi6kyRpBNmPbB9Vjvx0PtaEe9OFoFOz93hBT6E7rnK6WJ1OSx
- ATS6uWOtIwJIBfc1gCtX3L0OLFIEjBXTfoUDhfOJg/VTdudTVDbdy9sI/y9oa1CM
- oV5dmFGEmNiCJ+WyVnt0ItkoQ9j1ZT+bw/FVJXFTRSDhDL9NlNsdFz03AgMBAAGj
- WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
- dXRlLmludGVybmFsMB0GA1UdDgQWBBSfagScxn6u6P0+nvmQwcSLk2XrdDANBgkq
- hkiG9w0BAQUFAAOCAQEAlfdHL72URS71sqrZUfUiUWKHcJU1cfkO2Ekl/zhgRPrS
- 7FgP1HUYc9mRbceXJYqq38SSKDPANt3dIj+qeauUh7CNDSTm8pPmjrTaGYZCmOvV
- STobyosM7a+CJgZvE9Ys7tVlsbainrET0agTjUWOUE3LOvBgUqPUkbbE8QIgmRa2
- 62dtMf95WBmt6OJkXmLcBwUVK+1NsOfGN4cg6ekrKqNU4+FobK6Vet2jY6cfLWET
- fYj5FNoRpffRMQ9+MNEm/aK+SFpy1nXtc1XtD1sEqtnLGiIQMUhgEtvnas82T1f1
- rxodZ8fzQWvmeZ7qOiheeiTxu5Fwylj1xVBJ7suMMQ==
- </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://auth.digitaltheatreplus.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Digital Theatre Plus</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.digitaltheatreplus.com/about-us</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Jonathan</GivenName>
- <SurName>Ware</SurName>
- <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Carly</GivenName>
- <SurName>Britton</SurName>
- <EmailAddress>mailto:support@vualto.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4f919526..00000000
--- a/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ballbcauth.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a Balliol College: Main Site Network Registrations Shibboleth SP for Oxford University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:56:31Z"/>
- </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://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAJF9q6+yquHvMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG2JhbGxiY2F1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTE2MjJa
- Fw0yMjA3MTAwOTE2MjJaMCYxJDAiBgNVBAMTG2JhbGxiY2F1dGguYmFsbGlvbC5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKat3hIahwBr
- e/9cy/6ZMwoPDxNGissjmiBD7cEI8YkW26EyrSFlcEgTVDUrWWMyFoh8nCLJIPfK
- 4Lhm2WSJCiWj5z1NEEO/LE5HtA6W4T6D9VheAe1wbmL3pfq6lOfQ2reyi3wiruzL
- NsVxBq7NcVcoB1Rz+N6RezpU6eO4tI6OP+R8EgMvlAPw3/LgDix5rLsxnYuOrCsR
- QfuwyY0QisuQWrGV3Ko6InoB4/VgJzRX7nuiKOk0PPpM/wYYZdcWnWK2992Tk2ss
- /mHjW2D2yrfqjBc2KqCvMqk9w4SQRF58y1DNZhatoXSOreSGaL7gCYX3+M5zSLZ2
- oUNVMpe3Yg8CAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGJjYXV0aC5iYWxsaW9s
- Lm94LmFjLnVrMB0GA1UdDgQWBBQghUPDCQ70pB3A1tKNvIxtuDoGszANBgkqhkiG
- 9w0BAQUFAAOCAQEAPshnzBIb3O4qrk/i9y9EhhF7x6Y8RNQ3JeWEieAKeouJwCE9
- i7riRyhv0663cK2umvCMpTEvhprvzZLaoo3XtAgkAp4lInUBKbxu2Xz99r7tun8N
- Yk0hPLYpF08aSroUlWuNz2Hu+/8rcx3faWIdnVoxZqL27MvN07BDa75lw4vWi6d4
- rF06fgDgv85RmWNbT2Zf/IETkm7NKuIPxIq3B9n9EFTt6v6x2cys0y3e/Z6w/h0r
- fIJa1nSZqkrUSmx+s7wjbMxAp1OQrlwKaLvnnaXMbzacxQV6vuFUZXYSaB5jO3Lk
- haYMvhH56lpRhiY3alj0zO78dMy3bBTike/+tw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Balliol College - Main Site Network Registrations</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8f53f3ad..00000000
--- a/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ballhmauth.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a Balliol College: HM and JWT Network Registrations Shibboleth SP for Oxford University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:58:25Z"/>
- </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://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAOGLhfhvZmWrMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG2JhbGxobWF1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTIzMTVa
- Fw0yMjA3MTAwOTIzMTVaMCYxJDAiBgNVBAMTG2JhbGxobWF1dGguYmFsbGlvbC5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVc+Rvpuetz
- KGBDcLb5IE7kVWS9ocVnky49w1dPWfAzoCD6M8uUZXo5p3Uhz9qkjewinGfJzGGR
- DuOFQY7vHqdkStjTD6KiJpGqc7KMEVS3ALqVKcDooWXxoXPFVLw/KSerK+vJ2f0S
- dmQSzHZbybHrQiu/uSiEgiAS9LFNpTf1NqYzJKpgQHOk43Fy1qxcFmY9etlzyQNF
- CIrmrrGKqPGhE4I5wdXa+iSuodHBok7f66EcgX425Icyy9jpAG+I4vK/ZW2QaFd+
- ls2WoeyHqeHd+6bDzx9PM0IZg/yoBB+yNazI0UXXvmphPSpPUCxza+BBY4M2JOOc
- 9ckQg6JE+tcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGhtYXV0aC5iYWxsaW9s
- Lm94LmFjLnVrMB0GA1UdDgQWBBRdqcX7hnNNa8HySZBpyM0WVZQPAzANBgkqhkiG
- 9w0BAQUFAAOCAQEAGs2pK0uRW742oR1oqbMsSclc+iFboWXUQgWGFv8MiuZllbwa
- THJNCCpmBw2OYjfXaztvbJ8csEGsbYmaNO/hLqeIrEdhS4WyBqK4LpNKFiasX+a1
- ChokEfss17afSc22gsbV+DL3NgCIpI+LwTjGHSHciZ6mfinYoMyyRDYGUJ+Ty75e
- dU3NwYxplRumD3fneIrLsQ4NqV979yvJSWlShKdb0O+4t1qRSMVPZb74plelI/f0
- c28WqAH/V6JwRtXQEm30eRjZhRD4SXJtDLyPkLuKXQ/FTXRdI1HSqVMMi2ll4VqN
- +VBl8jTl7qVzQIzFCFIdwLOaSSCvNrDsB7b9Cg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Balliol College - HM and JWT Network Registrations</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index d047b058..00000000
--- a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bamboo-server1.oerc.ox.ac.uk/shibboleth-sp">
- <!--
- This is a "Surfnet testing server" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-17T12:30:00Z">
- <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>
- <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://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
- VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
- BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
- ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
- aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
- NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
- EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
- EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
- JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
- XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
- MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
- zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
- ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
- 9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
- ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
- gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
- BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
- aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
- cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
- cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
- BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
- ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
- g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
- HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
- E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
- MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
- </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>
- MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
- VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
- BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
- ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
- aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
- NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
- EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
- EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
- JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
- XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
- MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
- zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
- ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
- 9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
- ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
- gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
- BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
- aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
- cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
- cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
- BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
- ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
- g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
- HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
- E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
- MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Surfnet testing server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ca696337..00000000
--- a/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bcauth.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a 'Balliol Broad Street Network' Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-06T14:59:05Z">
- <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://bcauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAKNJoARfVmrDMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2JjYXV0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMTEwNTExMjEyNFoXDTIz
- MTEwMzExMjEyNFowIjEgMB4GA1UEAxMXYmNhdXRoLmJhbGxpb2wub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB1ycoTYISS4JQCewMhcX1
- 3OyFUiM7QkDUIzYcBPXDYB0HnPOKfxogtqqqpVaSDpV8PMctzmC0HFegyQUpiaay
- MGpruiTHZt32SFpoElAzNgRiYhq07BpbreEtyqUOd4IN7hkoO0VGnwCbDQbpcOHS
- lOJvpE3LJ4XLnYk3ehch48DIcVz6E1S7vcnuRhTZll6xFBZYvUC4/efdVGa+IwMu
- /9PFZNLJjNyqNpsn25oqU6nGcjVl4RVuaqxKEkRP3UUBz7Mniw0VRiGkoooq7l+x
- UAH5LethxKvE2cOnxlC7EPMgDFHzUQQUkvyLCbF+cojMy15tMpI1+6QXYNcL02In
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2JjYXV0aC5iYWxsaW9sLm94LmFjLnVrMB0G
- A1UdDgQWBBQgpNW7Sez6+a15zS454YNgTixXQjANBgkqhkiG9w0BAQUFAAOCAQEA
- U90aMn62TVY92FTIPhj5NaGr8ZsjfAZqalAgV6HZiPfQAEAFjsQc0ny6fpEpFR/8
- 1P8EbBzL28CdV4bwvH2o8J1rf7HMf1M2YWeQ279Kr0DYaz+JixBz7IgQOIlgx5p7
- X3ZAP4qTqqCM9fNosD4JWIB/dsWotq9NBcXbqpF9u9pc9Uj04bccVHk9v9j7BVVT
- qcw5/TzuUkZwnOiUFkbqwowwilrlWcvZZnOCqziVy2ywypo2r+HGmzIpy1HOYyDl
- QrTN0bUfZD6pqaeYxXXOXA2f4+Ppgad6Lu1NOIJv5Q47NoFgP8ZUe2FOKbdoFTeY
- o5iClvqE01UYKNRhpp+GsA==
- </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://bcauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Broad Street Network</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 39bb21e1..00000000
--- a/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.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://bcm.some.ox.ac.uk/shibboleth">
- <!--
- This is a "Somerville College BCM" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2014-04-02T09:46:16Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJAIYejqWu46+zMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWJjbS5zb21lLm94LmFjLnVrMB4XDTE0MDMzMTA5NDczM1oXDTI0MDMyODA5
- NDczM1owHDEaMBgGA1UEAxMRYmNtLnNvbWUub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC3/pTZtwd+x63mfU8PYXNRNJK1qokqjUuaeeDL
- VwX4A1PdXsbhzDusrbzxSR8P+/TDwrfJfWUflOXDYpjLG4zk8uuif/oLMQ4kEX4T
- MbN0Jllyi74ph4hwB2Lq224zVhW2zgKAb2tksbDzggOnNoDjJUvG2+4IMKm1XtYA
- CcofaYHW2fE/8IaS4qRz2utZuCbc+mkm7kDuHIYJ7+C8WHOQaKZcdVJRHvISDwEJ
- JU2q+YqC0RyxpvIrdcGzSE1HkD4jfr7vflbvlQM0Jse1tt8xWBMrC89t7UrB/9cm
- LdeyO63cxuoXDyKRN3WnnpxCMjwZbAmZkWtn9vQhIvSHAok/AgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWJjbS5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBQDdl2hRFoRRk9l
- YNksqL0D1EqWfTANBgkqhkiG9w0BAQUFAAOCAQEAgZjYNkh3/Q+Qu7u5V0/8KFkB
- +vKjcxg8BlfVX13l8baFBsTrY75SzZdGguoZGlKQwPD/nlvg0/6LUTfh1J7hRsRo
- UYkiGki7Tm/bXUKADV20G3audlttxplZVdhjhnQMW8QTuqN30y+C6M/bebLZn2oO
- Ofbpm65EVD46GAf3NjpUKABOS/52TH5xAlZE2CgVaLLgZuJ37SH1ajviemD8LEk9
- oe0tlcwQnrqLD99fcQe9JxAfdx3KySdQVvbRajP1UQLC833vpkSPraxsG8MVRwQZ
- I9ZcKjWaioIzqjMaGYuv6vKtRLeSBWBxbbruArMnqoGSY1k/gShcefyDAf12+g==
- </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://bcm.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College BCM</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 18248e0e..00000000
--- a/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bcm.sthughs.ox.ac.uk/shibboleth">
- <!--
- This is a "St Hugh's College NAC" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-09-27T10:58:41Z">
- <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://bcm.sthughs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJAOxYXh87TIZfMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGJjbS5zdGh1Z2hzLm94LmFjLnVrMB4XDTEzMDkyMzExMDUyOVoXDTIzMDky
- MTExMDUyOVowHzEdMBsGA1UEAxMUYmNtLnN0aHVnaHMub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD8L9og/HG4pFGOXIRVIV0vXGXfIEa1
- r+f0+F9psIaNtSjnoaFoxU3h+shtdxnEKL7+owmsYK6TE4gNTbshr1DZ3R2eX61Q
- IuKPAPTgPxR0iBxLjYdhHGS0POzsZq4RWMgRs8HugQnHs/VmQjHH0tPPdHC/vTNm
- ZkVHWJvljVwjPDKwZ8s04G5SX6URa3JYsQq4p3Ak8p1Jdu87IeZ43xOXReTcrc7B
- 5dxgVWs4z9CJXIkwgAExb6MwzBiEFh6z5OJPT9UTC9crCr/ubOH37ag3VBW+qDRy
- 82Wkhzqy23pejRo/XjD5HoNwciaS3V5XtbrGk3aeqwIlpKMfXO8fBUBlAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFGJjbS5zdGh1Z2hzLm94LmFjLnVrMB0GA1UdDgQWBBQF
- 24GC7un9VlxSwrqH68P+G2RDoDANBgkqhkiG9w0BAQUFAAOCAQEAEWPSCBEugRn4
- 6d1kDa+tmDuBNMTIaHBjOI5lMUJcUKzdkQGqpm5TqyXvSnyRBnWFrUCgkxEqiqhI
- CqDYpxEL4ZqPJE6gDj0fySXZ3BWY9WYVXZwCtFfPtAKwLSDhm5AxVQwN86QZzMtC
- P7XBcaY6RnWCSBSlKvCkwMmCfaBaocmaI6FtXLRnffeiL7otKn+0CRU7H8eNFM3f
- d0+9B6OXPhOYZLCZdi+lohyJJAgC69eGxmgkvOS9f2wHtvlmzCsT9+GDJdhdwhco
- sTFffODhZHy7jZWOfOG0p1fkP7HBWhYhkwk+H1mwbkAeaFrzg0x3usgftcWPkGxT
- Juej92IuLA==
- </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://bcm.sthughs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, St Hugh's College NAC</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.st-hughs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ben</GivenName>
- <SurName>Bridle</SurName>
- <EmailAddress>mailto:it-services@st-hughs.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Bridle</SurName>
- <EmailAddress>mailto:it-services@st-hughs.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8e4be2b5..00000000
--- a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.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://bcmtest.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College test BCM system" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-06-10T10:15:43Z"/>
- </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://bcmtest.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLDCCAhSgAwIBAgIJALCv+bulPWu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGJjbXRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMDYwNzA4MzcwNloXDTIzMDYw
- NTA4MzcwNlowHzEdMBsGA1UEAxMUYmNtdGVzdC5uZXcub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0cLeXLGI3vQXsQFBvnbD/YUF2vRSn
- ox1F2qiLd2VSNL+j657o5wq0hZjLoro0Ee+gxA6ahVI0RlBN6uyc1S02FCd7PSa9
- 0n93KfKpL40Uj/0H+M6gwmMqv0CKQcM5uPQfMZPGZnFBI7G/i+XOWkRULP8fQ1lT
- ZceJiIELd0d7OptgwVH3mAGgp5LEFDiuApLkLWENhcLb3qTDA74qX1uiYj0kD19I
- U5Cbb97bTAcVyCj8LVgnp9b2hIoNOg0upDw3YqRp3m5CqTKNfqOm1CViqyBa4pYq
- L+x6SxtoHP/D2cqG39irKX64oMcV7LdkfKbCeTC7EUyE1ctsRgRqojcrAgMBAAGj
- azBpMEgGA1UdEQRBMD+CFGJjbXRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2Jj
- bXRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFBFln19MZG+e
- J17IgU8o9c4pZlC1MA0GCSqGSIb3DQEBBQUAA4IBAQAiamHirEjlyEkzpYdtC47P
- GGSaM8qLbmjzRUvb3Tgp0Bio21a9h/nQI0yu2u35/mUyWXipAQzA/qdMBq34KUgy
- XxeWByT6dyncB9uS3ZTAIcR2IjHJUj+fiW3317QJpL2Oq9OSO5mZ9DH1cgKnWhK6
- JQBogeOnB9c2hM7IzOwvNe2H0EtqxgFDYnzGsWlhvddNcTDpOAWvyBUfA7uFHEmU
- f1O6QnyW1PJA9bamGntVs0curAhoEnYewZRHS7NxGl52wM9E+ESuMYb4VLb73GL0
- iCE6OCCjV5non0T45y0UOL0t69mf/TRp//I21O+9bhDniCkuWLMVKfRTpyxUroPQ
- </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://bcmtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, New College test BCM system</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml
deleted file mode 100644
index 03161068..00000000
--- a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.digitaltheatreplus.com">
- <!--
- This is a "Digital Theatre Plus (setup site)" Shibboleth SP for Digital Theatre.com Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-04T16:07:08Z">
- <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://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Digital Theatre Plus (setup site)</mdui:DisplayName>
- <mdui:Logo height="60" width="104">https://live.digitaltheatreplus.vualto.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSzCCAjOgAwIBAgIJAN3dSNg4hiPsMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
- BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
- MB4XDTE0MTIwMjEwMjEyOVoXDTI0MTEyOTEwMjEyOVowNzE1MDMGA1UEAxMsaXAt
- MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWIBkrkj+I6eUqYNMmNdjkDF4phGN+
- sNIjyo8kCcYc7Wb/WFYADECTYtZbKkSWBARejxCAGiqp2XGhpwN91cisYeeVY79B
- EnI7O45meAasDOFGRVc8ciP5PaujLqz3zwWt8YAnsQizmq7bpvHerZQIkQt9c1Km
- NeREIMJDB6FH0ZTsUbVLxDtQnAEHJ7jj0seNkDmNXP4ooiipKbZYbCVyksp6i6fV
- xGp7bIZodBg7U70TK9zQuBPx3TWZsevxOcVwyaH5f3q5KijjBFOfPKGLkAhJ9xxF
- sy1XhBPSaXCZ5wcfM86ZkmqjXauR90JwxDAciPorYV19BvHdFBVw0/7VAgMBAAGj
- WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
- dXRlLmludGVybmFsMB0GA1UdDgQWBBTcWEhiwHcbivBKw8bU1P5X912UljANBgkq
- hkiG9w0BAQUFAAOCAQEAu9c6LYR9f4jCqfjUG+8aQohiqU4MYv9BWsTCchaEsjTX
- TkbJP9r9G9ftc1eLUh9Ct8A4kKpk2qmb5dGYYn15YicvgTy1oS6foqck5IEmUllQ
- pfw4r2O4rnTNaEKugxHrh9MTjy5aNOBAzJiLzz8Yy7kbVahaZJSloZySUeyLCbKh
- OYvUnue1d7biTwQccRE7zMqTLO2B07KUzLVV75zhNIEeZlStQ0ubRBM7qmq52Jgh
- LzDYGo/doin3Q2xtR/QRMHtxbxh1EFsRbPKbGjp89sNBrGI+RxE6SLb22dD7sy/m
- 5S4VgGuIjXcu5pGhndoGHXSmeg3DLMKSrmrkJUcNQg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Digital Theatre Plus (setup site)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://www.live.digitaltheatreplus.vualto.com/about-us</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Jonathan</GivenName>
- <SurName>Ware</SurName>
- <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Carly</GivenName>
- <SurName>Britton</SurName>
- <EmailAddress>mailto:support@vualto.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
index eba049df..8b941862 100644
--- a/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
@@ -24,7 +24,7 @@
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <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://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
<idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml
deleted file mode 100644
index 16caecd4..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml
+++ /dev/null
@@ -1,83 +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/adfs.smk.dk/FederationMetadata/2007-06/FederationMetadata.xml ">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-19T13:49:56Z" 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">smk.dk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="da">Statens Museum for Kunst</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">National Gallery of Denmark</mdui:DisplayName>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>smk.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>MIIDFjCCAf4CAQcwDQYJKoZIhvcNAQELBQAwUTFPME0GA1UEAwxGaHR0cHM6Ly9h
-ZGZzLnNtay5kay9GZWRlcmF0aW9uTWV0YWRhdGEvMjAwNy0wNi9GZWRlcmF0aW9u
-TWV0YWRhdGEueG1sIDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMFEx
-TzBNBgNVBAMMRmh0dHBzOi8vYWRmcy5zbWsuZGsvRmVkZXJhdGlvbk1ldGFkYXRh
-LzIwMDctMDYvRmVkZXJhdGlvbk1ldGFkYXRhLnhtbCAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAJIFoBPrQfa+h0nbOIcTuGJq1ribQKKtQaCdPYgOFm9YPNNhO5QO
-Z8+W57Jtz9pkVhzcn6LiE4+L5dK+ZC5ERRAGPnMHJOHzC2Ues2bi+uzZbhOHpBAU
-9um7PY3kDH96TGn4zfeG1QMi+erpUOeOlJ58FfWYbrqqlTvRirN6wNW+sJvPm/sz
-s+vN/UXD2qRL55Z6vG06sfvE9O0V4I/9X7001REowDiD6qlU/bZForXE5jw8aOjT
-ta8K6Ot5J2B3eqkFoBhhK/aNJczdTfWgGc6Bru5/0TboE4Rvfy1GmpS7wROlK9bj
-APsEZFBbmAlLIvm0bNHqB/h1FTcRpOQxgMU=
-</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>MIIDFjCCAf4CAQcwDQYJKoZIhvcNAQELBQAwUTFPME0GA1UEAwxGaHR0cHM6Ly9h
-ZGZzLnNtay5kay9GZWRlcmF0aW9uTWV0YWRhdGEvMjAwNy0wNi9GZWRlcmF0aW9u
-TWV0YWRhdGEueG1sIDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMFEx
-TzBNBgNVBAMMRmh0dHBzOi8vYWRmcy5zbWsuZGsvRmVkZXJhdGlvbk1ldGFkYXRh
-LzIwMDctMDYvRmVkZXJhdGlvbk1ldGFkYXRhLnhtbCAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAJIFoBPrQfa+h0nbOIcTuGJq1ribQKKtQaCdPYgOFm9YPNNhO5QO
-Z8+W57Jtz9pkVhzcn6LiE4+L5dK+ZC5ERRAGPnMHJOHzC2Ues2bi+uzZbhOHpBAU
-9um7PY3kDH96TGn4zfeG1QMi+erpUOeOlJ58FfWYbrqqlTvRirN6wNW+sJvPm/sz
-s+vN/UXD2qRL55Z6vG06sfvE9O0V4I/9X7001REowDiD6qlU/bZForXE5jw8aOjT
-ta8K6Ot5J2B3eqkFoBhhK/aNJczdTfWgGc6Bru5/0TboE4Rvfy1GmpS7wROlK9bj
-APsEZFBbmAlLIvm0bNHqB/h1FTcRpOQxgMU=
-</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/adfs.smk.dk/adfs/ls/"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="da">Statens Museum for Kunst</md:OrganizationName>
- <md:OrganizationName xml:lang="en">National Gallery of Denmark</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">Statens Museum for Kunst</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">National Gallery of Denmark</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="da">http://www.smk.dk</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.smk.dk/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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 9a02edd7..54a0d5ee 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
@@ -9,7 +9,7 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drcmr.dk</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="da">MR-Forskningssektion (DRCMR)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</mdui:DisplayName>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -66,9 +66,9 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/drcmr.dk:667/simplesaml/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="da">MR-Forskningssektion (DRCMR)</md:OrganizationName>
+ <md:OrganizationName xml:lang="da">MR-Forskningssektionen (DRCMR)</md:OrganizationName>
<md:OrganizationName xml:lang="en">Danish Research Centre for Magnetic Resonance</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">MR-Forskningssektion (DRCMR)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="da">https://www.hvidovrehospital.dk/afdelinger-og-klinikker/mr-forskningssektion/Sider/mr-forskningssektion.aspx</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://drcmr.dk/</md:OrganizationURL>
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
new file mode 100644
index 00000000..71284944
--- /dev/null
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-30T14:58:21Z" 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">simac.dk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="da">SIMAC</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SIMAC</mdui:DisplayName>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>simac.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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cDovL2Zz
+LmVkdS5zaW1hYy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAw
+MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cDovL2ZzLmVkdS5zaW1h
+Yy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
+lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
+x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
+jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
+tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
+d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQCMnEPPjnsBWSGeheSYbDsSi0Xu7lRxxqEKZYwRCoTMmYIJRCXnJbPxA/BiP2nK
+K/ZnqJB9yHrNaLzE5rQw8QOkgCw1hGH3KspHtW29g9LkUpUnlPrmcqHYJFFuAIhF
+gsqSQ6jdv9q0q4vOSnhyKNVOA613djnxmNfbpPhwTMS6Udv/1euPi9xo6x/+ExL7
+beahYAykMS99l1bn1/tAhD+HoHbF1E5bKhsAQ5VqhEm+c1zY3sZNDrSi8ca7wv/x
+3vZ3PhzIxt23JHiArE7JPSQ7/8sbDf5qKUPRltdh8NxLRwVFzeyTrBwEwMF/mpRg
+fwnoK0wK5Qy+Hac98sg1DygI
+</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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cDovL2Zz
+LmVkdS5zaW1hYy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAw
+MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cDovL2ZzLmVkdS5zaW1h
+Yy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
+lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
+x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
+jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
+tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
+d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQCMnEPPjnsBWSGeheSYbDsSi0Xu7lRxxqEKZYwRCoTMmYIJRCXnJbPxA/BiP2nK
+K/ZnqJB9yHrNaLzE5rQw8QOkgCw1hGH3KspHtW29g9LkUpUnlPrmcqHYJFFuAIhF
+gsqSQ6jdv9q0q4vOSnhyKNVOA613djnxmNfbpPhwTMS6Udv/1euPi9xo6x/+ExL7
+beahYAykMS99l1bn1/tAhD+HoHbF1E5bKhsAQ5VqhEm+c1zY3sZNDrSi8ca7wv/x
+3vZ3PhzIxt23JHiArE7JPSQ7/8sbDf5qKUPRltdh8NxLRwVFzeyTrBwEwMF/mpRg
+fwnoK0wK5Qy+Hac98sg1DygI
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/ls/"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">SIMAC</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">SIMAC</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">SIMAC</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">SIMAC</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="da">http://www.simac.dk</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.simac.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-sso.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
index 400e4b94..57746f28 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
@@ -10,7 +10,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="da">University College Syddanmark</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University College Southern Denmark</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>ucsyd.dk</mdui:DomainHint>
@@ -67,11 +67,11 @@ khTTgjpn99S7L2hP
</md:IDPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="da">University College Syddanmark</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University College Southern Denmark</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University College South Denmark</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="da">University College Syddanmark</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University College Southern Denmark</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University College South Denmark</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="da">http://ucsyd.dk/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://ucsyd.dk/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
diff --git a/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 46245429..00000000
--- a/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bits-dev.uas.ox.ac.uk/shibboleth">
- <!--
- This is a 'Business Intelligence Development Environment' Tableau Server SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T10:19:31Z">
- <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="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1
- MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl
- LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx
- 9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY
- hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP
- AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E
- aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA
- AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl
- di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G
- CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp
- d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2
- uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM
- 09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9
- ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2
- 2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ
- </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>
- MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1
- MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl
- LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx
- 9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY
- hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP
- AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E
- aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA
- AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl
- di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G
- CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp
- d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2
- uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM
- 09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9
- ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2
- 2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-dev.uas.ox.ac.uk/wg/saml/SSO/index.html" index="0" isDefault="true"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Business Intelligence Development Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Nick</GivenName>
- <SurName>Letellier</SurName>
- <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 621fbd83..00000000
--- a/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bits-qa.uas.ox.ac.uk/shibboleth">
- <!--
- This is a "BI/Tableau QA" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-16T15:53:33Z"/>
- </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://bits-qa.uas.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFjCCAf6gAwIBAgIJAPu2m10yz119MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGJpdHMtcWEudWFzLm94LmFjLnVrMB4XDTEzMDQxMjEwMzQyNFoXDTIzMDQx
- MDEwMzQyNFowHzEdMBsGA1UEAxMUYml0cy1xYS51YXMub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlCzyiE5Wj4Nnr3cNPtsUAf4OLK6ta
- CWgT7Ph4neO0SjNX97p3A5EC+vtrRcoTrThCroeRKU7WHRIAV7yan/yJbfSWSXPl
- 3qhRIDlGPuzOK69mNEKJwzaGpgPSanevbKwbwghZ0dkHHD5EyKiKsQPzj2xI+tOc
- fiNkCMRN21m8VmSpSXnSXzsvhUMDGmd7NnS0wsnqPNg2KTIUKWQMwDsPlTcP+8Ab
- yU2GvBGYZDpbkyad1KPRq/WF25VBsSn0XB///1Eg717x0fkiVWhXu0/n7qWhNQ2D
- X0UB87Kae7t5tMwt+tCzQoOp4bu0RjaEbCyM9aONep6ebrS0fTWmv3nHAgMBAAGj
- VTBTMDIGA1UdEQQrMCmCFGJpdHMtcWEudWFzLm94LmFjLnVrhhFiaXRzLXVhcy5v
- eC5hYy51azAdBgNVHQ4EFgQU2c8+vZ/VozJj9PLzIxuLAEUMkA0wDQYJKoZIhvcN
- AQEFBQADggEBAA6d/Xb4sRTdNWIDaaOZR6bmamsRZUSXHXoct3AVK6OeQB++EPl6
- Lqo0PzkshDSqU/eStc1hJ8H9jJRFM/MshrhVK6rPrO4DwVDF/fSfZlLT91J/IHj6
- p8gOTesZZiycafwydtQeXNs5mmQuEy49mc70iH5yGYTlZg7L2okhk4asqSp2SpNJ
- htEQ6a1J/AiQljH7j+xMzW02eHLgXgDsGZ2A7N4ocPo69ZJU/9FMvSzh3um25mXm
- aX+mEeH1eblRgiKHwzymWw+S7GbyAIcwDs3mP3R9X/GUtSPI6xFk1C8vYWHxbRPr
- TQgeoPeqJAMzETO1ZYr5fAK5+enpkTOgXNY=
- </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://bits-qa.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - BI/Tableau QA</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Malin</SurName>
- <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c0a08b8d..00000000
--- a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bits.uas.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for University of Oxford
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-25T11:54:02Z"/>
- </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://bits.uas.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDTCCAfWgAwIBAgIJAN6n87m9JqBAMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWJpdHMudWFzLm94LmFjLnVrMB4XDTEzMDYyMTEwNDU1MloXDTIzMDYxOTEw
- NDU1MlowHDEaMBgGA1UEAxMRYml0cy51YXMub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCd+fqX2VRSIL9K4DMFfZtObbZkbXEvSyHWtFI5
- oAIIbfvmmE0pziAC2Rbxa9nLLRw2G7d9AEfW2ktOIS9AE1LVZLoK7v0gvatV7ZaH
- 13C6domsuQzWELqG+vHR9cyIX1tiL8oo+kJLrniHpMuifdm5I+XKTfjNmu493Het
- sjxu0DpsezqE9F1tlA9mBlSjqKFfp8uYhS+1HjVhT9E+k/TSwz3K/k2EkcXFLKFG
- 4KCFr+bZeW5wiUmy3r87V1N0Zph8uObix00+aQKi0dwCLgIxSRM/LPfakN9gk0L/
- j2EydLJw0APmPXh8D9IKZAtRGOcN44P2UMc3k9N+a8VR4OJBAgMBAAGjUjBQMC8G
- A1UdEQQoMCaCEWJpdHMudWFzLm94LmFjLnVrhhFiaXRzLnVhcy5veC5hYy51azAd
- BgNVHQ4EFgQUsUURuBA+9z5VuLCzxXXODxH4G5UwDQYJKoZIhvcNAQEFBQADggEB
- AHY96+ozosd3+kYqe9+xKAobDbTX7ZczK51PfzwmLYBRlt6p/yauGoJqSEoNhrPy
- x4BZ8fPKHgKA2iqAFm5RzBv6t883VR9Npt0P2hQ8+fArcczgwDeCBKTZ16VLlQSy
- VPZm7/QRGNU8EKx+CEYa5xUAk03Q7XmtmKI3Au7lOkRG0rpHAPTCiEvNcTuniMKl
- DUSludjtx5UzkiYMRp+5048aTmQBmiHWsvrIUWsaX5vMBt+9QQSOXJEmJ8bRkpkB
- o8JhwcADWs/8/XCO8IgVJptowHEkJKlHdyyCTr106+Vp62wLwMHzZSlRKTK3VKO2
- j+LYa2YPte02DhcTeM41wXo=
- </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://bits.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Business Intelligence Production Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ops Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Nick</GivenName>
- <SurName>Rumble</SurName>
- <EmailAddress>mailto:nick.rumble@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 300b229b..00000000
--- a/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blogs-staging.it.ox.ac.uk/shibboleth">
- <!--
- This is an "IT services blog - Staging" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-16T15:20:41Z">
- <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">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQDCCAiigAwIBAgIJAJyLQwUsXJSZMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWJsb2dzLXN0YWdpbmcuaXQub3guYWMudWswHhcNMTMwNDE1MTY0ODUxWhcN
- MjMwNDEzMTY0ODUxWjAkMSIwIAYDVQQDExlibG9ncy1zdGFnaW5nLml0Lm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/YPIiOAoCXfALT8
- WZfTK9PbQ6jJtwkJa8ETe89mFngzt27IQRq6HfbDGaae7xLi5NwHJGZy4VqujDDz
- 7s5wyJq5os1jTtWijGhTmOl++DG+ikxBJlcHY2/dfzQygm7Z9d2jmJIFtblU7xd/
- sy/40p4zNBbn/doLgUrITgetvQRU6W34u4EjHDabbRP05xDHdjyxKI52XTYui9l3
- tK5SSl88tjELz6SKGmVFcvralHrXV20N+z17Zpi27W/SPMLkRVlKyujB7dLefh1y
- zVHz3gTx7d3YmavOqtLwYl6/myaDRVQlUcLZ2YXXfKdTb64tyq0apyj8SZVmoq+k
- JO2ZGwIDAQABo3UwczBSBgNVHREESzBJghlibG9ncy1zdGFnaW5nLml0Lm94LmFj
- LnVrhixodHRwczovL2Jsb2dzLXN0YWdpbmcuaXQub3guYWMudWsvc2hpYmJvbGV0
- aDAdBgNVHQ4EFgQUFHP6ZM/XvChLzDtS5krGBp0Q6J4wDQYJKoZIhvcNAQEFBQAD
- ggEBACzXiMpJ9mCcm4gG3Rs9k0rAOclS8yajKB5Y4VJfxWBu4gxOa9TFqmRbg903
- xliozbxmynVpXLgeG5p62rHEr65d/iV625zQkzDBx3iFQ8mMjYzsogKsptU+1RwX
- yJdKnSfoYBOupZFbyvAFoyBcL5RU5+1OnqBF2in/Wk7viR2BCGJ8ifooakfsOOXy
- On1okBIY4STVJlE18KlMZUODxioKbjqb3Ng1jIPlrvmmPc4CzcawLPABIMC0YdKA
- EJUJGg/45Qsye1PuZ/NbTkACvRPsggxh3uxzGcIZs2zQzShZRn7WLM/UfOS37HPs
- b+AsEcMnbx8LooBYklkaNosfumI=
- </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>
- MIIDQDCCAiigAwIBAgIJAJyLQwUsXJSZMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWJsb2dzLXN0YWdpbmcuaXQub3guYWMudWswHhcNMTMwNDE1MTY0ODUxWhcN
- MjMwNDEzMTY0ODUxWjAkMSIwIAYDVQQDExlibG9ncy1zdGFnaW5nLml0Lm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/YPIiOAoCXfALT8
- WZfTK9PbQ6jJtwkJa8ETe89mFngzt27IQRq6HfbDGaae7xLi5NwHJGZy4VqujDDz
- 7s5wyJq5os1jTtWijGhTmOl++DG+ikxBJlcHY2/dfzQygm7Z9d2jmJIFtblU7xd/
- sy/40p4zNBbn/doLgUrITgetvQRU6W34u4EjHDabbRP05xDHdjyxKI52XTYui9l3
- tK5SSl88tjELz6SKGmVFcvralHrXV20N+z17Zpi27W/SPMLkRVlKyujB7dLefh1y
- zVHz3gTx7d3YmavOqtLwYl6/myaDRVQlUcLZ2YXXfKdTb64tyq0apyj8SZVmoq+k
- JO2ZGwIDAQABo3UwczBSBgNVHREESzBJghlibG9ncy1zdGFnaW5nLml0Lm94LmFj
- LnVrhixodHRwczovL2Jsb2dzLXN0YWdpbmcuaXQub3guYWMudWsvc2hpYmJvbGV0
- aDAdBgNVHQ4EFgQUFHP6ZM/XvChLzDtS5krGBp0Q6J4wDQYJKoZIhvcNAQEFBQAD
- ggEBACzXiMpJ9mCcm4gG3Rs9k0rAOclS8yajKB5Y4VJfxWBu4gxOa9TFqmRbg903
- xliozbxmynVpXLgeG5p62rHEr65d/iV625zQkzDBx3iFQ8mMjYzsogKsptU+1RwX
- yJdKnSfoYBOupZFbyvAFoyBcL5RU5+1OnqBF2in/Wk7viR2BCGJ8ifooakfsOOXy
- On1okBIY4STVJlE18KlMZUODxioKbjqb3Ng1jIPlrvmmPc4CzcawLPABIMC0YdKA
- EJUJGg/45Qsye1PuZ/NbTkACvRPsggxh3uxzGcIZs2zQzShZRn7WLM/UfOS37HPs
- b+AsEcMnbx8LooBYklkaNosfumI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Oxford University IT services blog - Staging</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Services IAM Team</GivenName>
- <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Services IAM Team</GivenName>
- <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c74f0d53..00000000
--- a/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blogs.it.ox.ac.uk/shibboleth">
- <!--
- This is a "IT Services Blogs" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T07:45:28Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
- MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
- cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
- BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
- /+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
- DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
- I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
- MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
- Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
- 8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
- yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
- 8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
- 9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
- </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>
- MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
- MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
- cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
- BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
- /+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
- DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
- I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
- MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
- Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
- 8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
- yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
- 8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
- 9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: IT Services Blogs</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://blogs.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Services Help Centre</GivenName>
- <EmailAddress>mailto:help@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 73062a5c..00000000
--- a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://booking.ictf.ox.ac.uk/shibboleth">
- <!--
- This is an "ICTF Conference Booking Website" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T15:52:20Z"/>
- </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://booking.ictf.ox.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAK/ba/SUiWe2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azAeFw0xMzAzMjEwOTU3NDdaFw0yMzAz
- MTkwOTU3NDdaMCAxHjAcBgNVBAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/qxQYodiz2wlFTRKTunx1uXub3
- aMGFCoCz+m7l9lGQdfA+C24PRxWi4StUGqQmMJa97t/WtYcCbr05Ba4Kwg5v4c7g
- 23YBXFVFrFBtZnohMQSg1IaZNkWK8MwQGJTxFD+2b/KHRkrcHGbjEgHgGM+MYtdb
- kfWswHFR6HHKDV6zkAL+bK338bj/eCywT4hmhLx2iaI4BkkpQNtLZ3BkTVzC/Wxb
- xZ+Dy6wAfIkv8RMWbHih0+juYDM4FVTzwcn5Q7+O3Lmf//RyQRdZW3Tm+yJoOT4V
- 0qWkqDidl8WUKwmc/oEbsWcMk0PsmZS8o93f59Rsxrjyn/uCcL6p8t2c72kCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVYm9va2luZy5pY3RmLm94LmFjLnVrMB0GA1UdDgQW
- BBS5EwhqH1HRiDM3x+20r1OE1uZBDjANBgkqhkiG9w0BAQUFAAOCAQEATmwjfTI3
- 9y/e3p4hR77va41wvVS9TOlLCP8eZb9Kz4VwYW1yivqo2XfuLMgjniQWLJrZDDIL
- I0Z4D8CbN2Bu2fYK9NE7njsUhfbZUrhBd2Ec2XlL2ef8tI5XP8X+okXMRdcUmAG8
- 7J/DKbjByjYOAgZSR2h2YUrV4UmIb1+40ToFUd8DWVlUdNhtNxRecIZvlSd6HDP6
- PKn+cVXHEvUHhshA/8+FFbOlbBf+lKNiDKMlCdpEngK16aizDRPSbO7rrDyaz7fB
- t22YY+B+nypOCwam1z5qvpa4YUyp/zhwyjCVuubNP+IZnM2QCvP1PJaI6bffxSng
- cP2sORZYpAmpdg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ICTF Conference Booking Website</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ictf.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Jim</GivenName>
- <SurName>Leek</SurName>
- <EmailAddress>mailto:jim.leek@eng.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jim</GivenName>
- <SurName>Leek</SurName>
- <EmailAddress>mailto:jim.leek@eng.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 05f6f5dc..00000000
--- a/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bookings.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth Balliol Bookings SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:51:44Z"/>
- </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://bookings.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAMbZ2C/vjx5FMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWJvb2tpbmdzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1MzU5WhcN
- MjIwNDE1MjA1MzU5WjAkMSIwIAYDVQQDExlib29raW5ncy5iYWxsaW9sLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeX2Jcy7zo8Ul7no
- hC4u+uyyxZ7iMhtkQl/XFen+x/CrJJ9tZAtN2jtL/k25RcjVHuk4Z6541aDqqR5G
- 1sWi86sPZWQMfeWMLWLgK8waONU50bwAOzuCyYBq1MjX0lJ+QVYJvgF6lkKu4+0H
- bqKptvOpFcn9OeKU5DGUEz/H4DYvMSUMntmtN5Eluvtxy94r+wdDWdVrY7PZ2M48
- FtvV8P9luRiBAoMuiGE0Pm/zpoM7Xxt7k4oYZfoG5HOtMKE9dV65pmCKPv+h2bhu
- Z4FfHWt4U0/4XgvmeM5sY/JPFXGFBK8gXCoRfYMbrfQenzaVHdyN1HN0LCKOjSP3
- +poaLQIDAQABo0cwRTAkBgNVHREEHTAbghlib29raW5ncy5iYWxsaW9sLm94LmFj
- LnVrMB0GA1UdDgQWBBQBuS1FvgRlEaZWLgT0c14ZqONLXTANBgkqhkiG9w0BAQUF
- AAOCAQEAcxupRmcfDqaidBsS+6Cutd16AGoI9wSwP4xfJRPYhtzxO8dzLRiF2iEu
- QvA86Lpg2nWKDmcyT2o+Ekh9Obi+729Tsbn636ViuIx1oNEm77b6RO3WU1OL9KZp
- fZfWsEyT20yddL1OW1iagc9xS+1EpRin5kDzxerGouEEr14WM5HD0Bgpn93+fTMx
- UxXgdaE6PUQc5WC4iYZJGNZkpem9ib2AhZd/pw6stmRcRmS+KybbNTi8FmTWwzYV
- 2vs9eHkIBuxD5LoY31QnqxLDHZ45Zdyr/6mcslWCNti+vmiqzxK276aACCNxZ/4i
- ceBywtbgjdTLOe0SORf6He5VlljeUg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Bookings</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index bf15f9e0..00000000
--- a/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bookingsdev.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a "Balliol Bookings Dev" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-15T12:00:08Z">
- <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://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAK5gDlJ0M0NBMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGJvb2tpbmdzZGV2LmJhbGxpb2wub3guYWMudWswHhcNMTQwMjI3MTMzMTI5
- WhcNMjQwMjI1MTMzMTI5WjAnMSUwIwYDVQQDExxib29raW5nc2Rldi5iYWxsaW9s
- Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArdqcsCxH
- turqSl/2MS79hrrCfoamaWtQvPG27Hkdl1iQLmTVSdkdWOVfdFEg7PGhoCxYKvZi
- 0KQZnMO1WcKLHyIUpaqJa+fITw7fmW4CVk1KvWuua3FYQ9WXceF4aoEFRjdtqmT5
- pDfjiSRPcx4MTGBDzaAhodKKJKAG3QRkWGQWPY+jw6GuZ3uYRIPURPlJQCmkbYQy
- l4xuT1rEUL/knv9oVbmoo4R+xHapRWj16fq0T4QPsBhYcrXwnUEWhADurE7POvDX
- zTI2tNTH80Xgj9IpVjC56TO9GjqEbZ/2MUssHhrXF8CrztJ6n7gsvHuEd7oAC6eN
- 2w99RBgIBLkiewIDAQABo0owSDAnBgNVHREEIDAeghxib29raW5nc2Rldi5iYWxs
- aW9sLm94LmFjLnVrMB0GA1UdDgQWBBQofjvUEVMYX6jGvsUFnh1OoumrCzANBgkq
- hkiG9w0BAQUFAAOCAQEARJdCoSGbtzzHlyBvhj3eQINrJ6tw2w5VPjzsVSERmHlj
- 0Nh/RPcUQ1CQacA9HzpeiuHFr5kZ0wJNHcPinoIpQBmoHbKHpT8A+bFeTPHAb8Iu
- J+5EFJqi/nloVooVsdNGNxeVlFhaycCfTg76VWwbjUzUKmJpKTiDTWDEg1xNO0pH
- 2ezUffGaOYagOM4/jLRjb78nKdG9rQJZJ5zM/HumnVO0xvFAHEZgWwxKF4CpM/FP
- YPjKarM1GeukK0E8FLYdkJ24WELMhDVDXEZRNDdM+7gLzQgv+wQwYRpnMMrMRAX3
- ZDKjBX8+kEWIGSHzBuV2+PXDsaik4/fsoIVK7liylQ==
- </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://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Bookings Dev</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Balliol Computing</GivenName>
- <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Balliol Computing</GivenName>
- <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
index 781751de..0df2a168 100644
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
@@ -23,20 +23,27 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
-NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
-iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
-anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
-lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
-DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
-lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
-VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
-RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
-cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
-F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
-WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
+ MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxIzAhBgNVBAoTGklOU1RJVFVU
+TyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNFMSIwIAYJKoZIhvcNAQkB
+FhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlGb3J0YWxlemExDjAMBgNV
+BAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYY2FmZS1nYXRld2F5Lmlm
+Y2UuZWR1LmJyMB4XDTE1MDcyNzE4MDA1N1oXDTE4MDcyNjE4MDA1N1owgawxIzAh
+BgNVBAoTGklOU1RJVFVUTyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNF
+MSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlG
+b3J0YWxlemExDjAMBgNVBAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMY
+Y2FmZS1nYXRld2F5LmlmY2UuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAwbQCV74T4dzotdQhgUDJ7HKk4ax7RkCIe/wDWbZKiJWk/8C7FmMd
+5ny2BgHaD3ARXuwFW1HNxY+l8OcwSfBXTJxkurW53zlqdFRYcJeCqOAE4k8LlI1+
+6v1v5z7Prxyyi03ruX/gqFOFWVfVsNIqyBv2wHOUd3GWaM+o+3ic9Abd/d6D4D7N
+VWhNtyINH4wzRpqjDDSgWymwHGxI7ObBM7zLlJaHRm0M3nT8oh5mp2YtH9s2DRUg
+eJ7IqCC7R1/vnzemh/CGr+SHDzmRrJFY5lGUrYM+oziWRZgVr2HCLtKNWIa17iIU
+GblDJT1E7G2vUGtGu5WHWC9GJDbUkSpiHQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCr74KCtDeIeMqWHLlky2SJOsFWp5GYsv2MTN985m+6C9drVN0MKh7vmJE0WXOE
+ofIVJhiKOnA6cJ2nnMRtkYllHnfD5HdMpe3ImZ6kL7Phw9I6jcVjY/dIiL2txG7S
+NwbZWVpqu/bTQIkxiFB3qAujuPfeT6NaXQ6mNv0PmnC/76raZkr9MxpPi24z1i7Q
+GDbGrk0297/Kq6u+JoYV+Sy8OYi9P23ibg/jV+ACkfy7K4xDQZ76gg0bWvTK4sFj
+s9aiqLOUHREjOXpsvEa/B6CxUvNCSZcQO5p+tkwnSHPvcmxEDjZV1rmaKCJsC/aA
+vcq7vVYrtEXcJLkmBCQuQvhm
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -59,20 +66,27 @@ WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
<ds:X509Data>
<ds:X509Certificate>
-MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
-NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
-iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
-anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
-lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
-DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
-lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
-VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
-RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
-cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
-F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
-WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
+MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxIzAhBgNVBAoTGklOU1RJVFVU
+TyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNFMSIwIAYJKoZIhvcNAQkB
+FhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlGb3J0YWxlemExDjAMBgNV
+BAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYY2FmZS1nYXRld2F5Lmlm
+Y2UuZWR1LmJyMB4XDTE1MDcyNzE4MDA1N1oXDTE4MDcyNjE4MDA1N1owgawxIzAh
+BgNVBAoTGklOU1RJVFVUTyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNF
+MSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlG
+b3J0YWxlemExDjAMBgNVBAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMY
+Y2FmZS1nYXRld2F5LmlmY2UuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAwbQCV74T4dzotdQhgUDJ7HKk4ax7RkCIe/wDWbZKiJWk/8C7FmMd
+5ny2BgHaD3ARXuwFW1HNxY+l8OcwSfBXTJxkurW53zlqdFRYcJeCqOAE4k8LlI1+
+6v1v5z7Prxyyi03ruX/gqFOFWVfVsNIqyBv2wHOUd3GWaM+o+3ic9Abd/d6D4D7N
+VWhNtyINH4wzRpqjDDSgWymwHGxI7ObBM7zLlJaHRm0M3nT8oh5mp2YtH9s2DRUg
+eJ7IqCC7R1/vnzemh/CGr+SHDzmRrJFY5lGUrYM+oziWRZgVr2HCLtKNWIa17iIU
+GblDJT1E7G2vUGtGu5WHWC9GJDbUkSpiHQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCr74KCtDeIeMqWHLlky2SJOsFWp5GYsv2MTN985m+6C9drVN0MKh7vmJE0WXOE
+ofIVJhiKOnA6cJ2nnMRtkYllHnfD5HdMpe3ImZ6kL7Phw9I6jcVjY/dIiL2txG7S
+NwbZWVpqu/bTQIkxiFB3qAujuPfeT6NaXQ6mNv0PmnC/76raZkr9MxpPi24z1i7Q
+GDbGrk0297/Kq6u+JoYV+Sy8OYi9P23ibg/jV+ACkfy7K4xDQZ76gg0bWvTK4sFj
+s9aiqLOUHREjOXpsvEa/B6CxUvNCSZcQO5p+tkwnSHPvcmxEDjZV1rmaKCJsC/aA
+vcq7vVYrtEXcJLkmBCQuQvhm
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
deleted file mode 100644
index f512d420..00000000
--- a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://cafe.fucape.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">fucape.br</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
- <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
- <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.fucape.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.fucape.br/</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.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.fucape.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.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.fucape.br/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.fucape.br/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.fucape.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">fucape.br</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.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">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.fucape.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.fucape.br/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Alan Ruan</md:SurName>
- <md:EmailAddress>alan@fucape.br</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 280185d2..00000000
--- a/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://cafe.ifes.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">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
- <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
- <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.ifes.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>
- MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
-IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
-SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
-VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
-MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
-bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
-bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
-BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
-v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
-3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
-omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
-2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
-mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
-H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
-R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
-HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
-mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
-sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.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.ifes.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.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifes.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>
-
-MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
-IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
-SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
-VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
-MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
-bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
-bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
-BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
-v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
-3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
-omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
-2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
-mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
-H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
-R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
-HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
-mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
-sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifes.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">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ifes.edu.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Ramon Ramos</md:SurName>
- <md:EmailAddress>ramon.ramos@ifes.edu.br</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
deleted file mode 100644
index f741c6ed..00000000
--- a/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://cafe.ifg.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">ifg.edu.br</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IFG - Instituto Federal de Goias</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:DisplayName>
- <mdui:Description xml:lang="en">IFG - Instituto Federal de Goias</mdui:Description>
- <mdui:Description xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.ifg.edu.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.ifg.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>
- MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
-MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
-1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
-GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
-Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
-E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
-YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.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.ifg.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.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifg.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>
-
-MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
-MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
-1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
-GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
-Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
-E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
-YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifg.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">IFG - Instituto Federal de Goias</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ifg.edu.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Diretoria de Tecnologia da Informacao</md:SurName>
- <md:EmailAddress>dti@ifg.edu.br</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
index 26f14ce6..409f3929 100644
--- a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
@@ -23,30 +23,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEYjCCA0oCAQAwDQYJKoZIhvcNAQEFBQAwgfYxNjA0BgNVBAoTLUlGUlMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDE0MDIGA1UECxMr
-RFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEoMCYG
-CSqGSIb3DQEJARYZcGF1bG8ubWFjaGFkb0BpZnJzLmVkdS5icjEYMBYGA1UEBxMP
-QmVudG8gR29uY2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
-A1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwHhcNMTUwNTA1MTYz
-MTM4WhcNMTgwNTA0MTYzMTM4WjCB9jE2MDQGA1UEChMtSUZSUyAtIEluc3RpdHV0
-byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMTQwMgYDVQQLEytEVEkgLSBE
-aXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSgwJgYJKoZIhvcN
-AQkBFhlwYXVsby5tYWNoYWRvQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9CZW50byBH
-b25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM0co9o7TbTG3+n7PbHLIcqBE2s3awk3ZdCMavoU6/lE2gTh
-lJPLw1zPRZ7oXNAu9CHdbsnyJMy/YNChyA+rfRYhbpTaT5g68DFu+9+QANr7BQac
-rsxqsJhnyfooB+ZslPCw8nLelIla5UiaX1DiaCccQ2DXEnGTq7sH7si3RrZaRB5R
-Wp2Ts7OHEYSYpDSNPTrGPQWJ6o1Ss9IVDd0WmCZJ6nYAjfAG/Y7nteCndfAP4TPL
-QdFkBhlXk+YbYLVOifGMzqUOnufALseCNCj4C2jXhgRdD3td1GFSfzQJkSx+BPkR
-ZxysbCgf4WlQc644MHjDSrcYsCIbwJ69cxjlcyUCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAbEftNLMzu3ALu/7RlRp2JUr6az5dYxifpzUqp2/zVn8h46yEawYU+WAs
-L2/j1JLb22XpfS114lTdK9cbgqvK29O5sHF6DAKFcZFTBscLWnpp6bUkXsl9EGzt
-IU8XZ4OPhdpPj3VxpoYhkzUCtslV+cyr3R68x0UyOjwfDMYQrA29OV10Tsp9kc2u
-zcLRGbpAgOg+4YL5zxJF+Vff3UxwxDiiQ003XmvpmGzcxTsf5VSNfiAwjFSlN6rX
-Wlqsc3dicPAd8gPwmxiz4stoPj/8uhjpFXIuB+amkZ4aNwUlzuZWpGjj/CGY0LS8
-pfWfFxGKmUY3hiiTl5PDJimzekIzmQ==
+ MIIEADCCAugCAQAwDQYJKoZIhvcNAQEFBQAwgcUxNjA0BgNVBAoTLUlGUlMgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMD
+Q1BEMR8wHQYJKoZIhvcNAQkBFhBjYWZlQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9C
+ZW50byBHb25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD
+VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTA3MDcxODIx
+MTFaFw0xODA3MDYxODIxMTFaMIHFMTYwNAYDVQQKEy1JRlJTIC0gSW5zdGl0dXRv
+IEZlZGVyYWwgZG8gUmlvIEdyYW5kZSBkbyBTdWwxDDAKBgNVBAsTA0NQRDEfMB0G
+CSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEYMBYGA1UEBxMPQmVudG8gR29u
+Y2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx
+GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDW0sT6IptdPSgeFZD82tHmfg5a2W3bmAqblRCtvZglNdLgpL5W
+NJMcgolvbumWM709Hv8cX5y1vwCFByV4hrDReU5YEgsKWvA5Eovh5LntWK5euKd/
+yALTEOH3k4b+ktF7TPIwCfsIpY3wcaBdGIGtNaqAJq9Vbmms9KgNmLmNNGtk8LF6
+QLT1IuLj9uGJrvTTtrD9aBhj0qbWtLtBbE7zHCUiPCK4sqHZon1xzHbBNy2BpTCn
+gclxri3xKElFqEpEiNfzSBfx8uicN1CYofKMMuMY2dHmGQeYl/oas3VVCo/CebR6
+E6a7MYZfQklnLYWh1UGwr3oUyuB+xF5SwL1rAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJszIng6ixxwRUsyMzHkpBuM6t9JsdfqHP3OtXQu3l2rru6Q1aatTA40H0sq
++ODSTIkvmbXrH1Sa0eobjwRCgIohzPxiK6xbxEnT/EnIBPoYNgJEXdfdM26Hi158
+d4ON/+NcLw2+WXtQJ3p1nyqpVP5ZDh+seCjYNGYCwm0Hv/X8MMoZ1X12ONwbDKzF
+nJMHAVlQBn6KfZ5hnLHCM7AMGzbmvNguvBKSHgASBCCHSm2y0dOMy47ynr1P/Srh
+iC7HCSCn/egq36udHpw14Zh1AW12yr0P5TWT0YY3Fony8MVpT6VO0W+lNwJ084DB
+4PBfkm2ud0+t4T9K/ym4hghmfHQ=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -69,30 +67,28 @@ pfWfFxGKmUY3hiiTl5PDJimzekIzmQ==
<ds:X509Data>
<ds:X509Certificate>
-MIIEYjCCA0oCAQAwDQYJKoZIhvcNAQEFBQAwgfYxNjA0BgNVBAoTLUlGUlMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDE0MDIGA1UECxMr
-RFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEoMCYG
-CSqGSIb3DQEJARYZcGF1bG8ubWFjaGFkb0BpZnJzLmVkdS5icjEYMBYGA1UEBxMP
-QmVudG8gR29uY2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
-A1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwHhcNMTUwNTA1MTYz
-MTM4WhcNMTgwNTA0MTYzMTM4WjCB9jE2MDQGA1UEChMtSUZSUyAtIEluc3RpdHV0
-byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMTQwMgYDVQQLEytEVEkgLSBE
-aXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSgwJgYJKoZIhvcN
-AQkBFhlwYXVsby5tYWNoYWRvQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9CZW50byBH
-b25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM0co9o7TbTG3+n7PbHLIcqBE2s3awk3ZdCMavoU6/lE2gTh
-lJPLw1zPRZ7oXNAu9CHdbsnyJMy/YNChyA+rfRYhbpTaT5g68DFu+9+QANr7BQac
-rsxqsJhnyfooB+ZslPCw8nLelIla5UiaX1DiaCccQ2DXEnGTq7sH7si3RrZaRB5R
-Wp2Ts7OHEYSYpDSNPTrGPQWJ6o1Ss9IVDd0WmCZJ6nYAjfAG/Y7nteCndfAP4TPL
-QdFkBhlXk+YbYLVOifGMzqUOnufALseCNCj4C2jXhgRdD3td1GFSfzQJkSx+BPkR
-ZxysbCgf4WlQc644MHjDSrcYsCIbwJ69cxjlcyUCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAbEftNLMzu3ALu/7RlRp2JUr6az5dYxifpzUqp2/zVn8h46yEawYU+WAs
-L2/j1JLb22XpfS114lTdK9cbgqvK29O5sHF6DAKFcZFTBscLWnpp6bUkXsl9EGzt
-IU8XZ4OPhdpPj3VxpoYhkzUCtslV+cyr3R68x0UyOjwfDMYQrA29OV10Tsp9kc2u
-zcLRGbpAgOg+4YL5zxJF+Vff3UxwxDiiQ003XmvpmGzcxTsf5VSNfiAwjFSlN6rX
-Wlqsc3dicPAd8gPwmxiz4stoPj/8uhjpFXIuB+amkZ4aNwUlzuZWpGjj/CGY0LS8
-pfWfFxGKmUY3hiiTl5PDJimzekIzmQ==
+MIIEADCCAugCAQAwDQYJKoZIhvcNAQEFBQAwgcUxNjA0BgNVBAoTLUlGUlMgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMD
+Q1BEMR8wHQYJKoZIhvcNAQkBFhBjYWZlQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9C
+ZW50byBHb25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD
+VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTA3MDcxODIx
+MTFaFw0xODA3MDYxODIxMTFaMIHFMTYwNAYDVQQKEy1JRlJTIC0gSW5zdGl0dXRv
+IEZlZGVyYWwgZG8gUmlvIEdyYW5kZSBkbyBTdWwxDDAKBgNVBAsTA0NQRDEfMB0G
+CSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEYMBYGA1UEBxMPQmVudG8gR29u
+Y2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx
+GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDW0sT6IptdPSgeFZD82tHmfg5a2W3bmAqblRCtvZglNdLgpL5W
+NJMcgolvbumWM709Hv8cX5y1vwCFByV4hrDReU5YEgsKWvA5Eovh5LntWK5euKd/
+yALTEOH3k4b+ktF7TPIwCfsIpY3wcaBdGIGtNaqAJq9Vbmms9KgNmLmNNGtk8LF6
+QLT1IuLj9uGJrvTTtrD9aBhj0qbWtLtBbE7zHCUiPCK4sqHZon1xzHbBNy2BpTCn
+gclxri3xKElFqEpEiNfzSBfx8uicN1CYofKMMuMY2dHmGQeYl/oas3VVCo/CebR6
+E6a7MYZfQklnLYWh1UGwr3oUyuB+xF5SwL1rAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJszIng6ixxwRUsyMzHkpBuM6t9JsdfqHP3OtXQu3l2rru6Q1aatTA40H0sq
++ODSTIkvmbXrH1Sa0eobjwRCgIohzPxiK6xbxEnT/EnIBPoYNgJEXdfdM26Hi158
+d4ON/+NcLw2+WXtQJ3p1nyqpVP5ZDh+seCjYNGYCwm0Hv/X8MMoZ1X12ONwbDKzF
+nJMHAVlQBn6KfZ5hnLHCM7AMGzbmvNguvBKSHgASBCCHSm2y0dOMy47ynr1P/Srh
+iC7HCSCn/egq36udHpw14Zh1AW12yr0P5TWT0YY3Fony8MVpT6VO0W+lNwJ084DB
+4PBfkm2ud0+t4T9K/ym4hghmfHQ=
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
index 7f29e5ba..8fb9e60a 100644
--- a/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
@@ -23,28 +23,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
-aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
-MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
-NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
-ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
-MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
-EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
-dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
-sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
-9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
-e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
-i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
-oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
-eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
-6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
-kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
-ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
-WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
-NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
-KNS9lg==
+ MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxKTAnBgNVBAoTIFVOSUZSQU4g
+LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSEwHwYDVQQLExhUZWNub2xvZ2lhIGRh
+IEluZm9ybWFjYW8xLTArBgkqhkiG9w0BCQEWHmd1c3Rhdm8uY2Fycmlqb0B1bmlm
+cmFuLmVkdS5icjEPMA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8x
+CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTUwODA1
+MjEyMzM5WhcNMTgwODA0MjEyMzM5WjCByTEpMCcGA1UEChMgVU5JRlJBTiAtIFVu
+aXZlcnNpZGFkZSBkZSBGcmFuY2ExITAfBgNVBAsTGFRlY25vbG9naWEgZGEgSW5m
+b3JtYWNhbzEtMCsGCSqGSIb3DQEJARYeZ3VzdGF2by5jYXJyaWpvQHVuaWZyYW4u
+ZWR1LmJyMQ8wDQYDVQQHEwZGcmFuY2ExEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKv46oStnlmR1Fa6hbCcOlgYZVOUCmF9pjXQDR3S
+yNBRtukPkfw/BxrhwnG0jwEVmoHfV0qgTk7gMjNtrJRoFctRQWLzglbxf1yBMTgw
+Pqwv5pJRslIOXJLytk5oOlNgDAzyW9olb4ZH3ykq96ssGxiBN/OqgeLB7jLcQfE6
+t5fPWA8s7fC3OmLvrf9DR/5JV489FjqrJUA2OqOa3ZYGPsOb7Iu+/ZgS3KzbjK/R
+pKOrV2GJBoRBylSW4QyNSjFHjnKWk5nG8AbArPzxc4Rf196xjgrcG6EUn9MgkN+H
+qK33rLEjPYinVgJhVutl4RPf3crIQnH40RlrfLseDxCnN8kCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAMb1OtL57m0uv+XnYIKq7PCPy+mgyfaEzMSLI6rVLiIcHkA6I
+wc46b67j9mG0xkipDaOci/fnSqA+VaVw8dM2NLOVRUgKLwyZ51jm0OojoIxxoXW3
+yQyvEPC3TxFT3C2aVA6u6HaxutoTc3X1iFN0Chp3RhQO1wUIuEpGoDYA4AzBHgsL
+J0KJhJ8we4MfG8Ykhosw2NGe+3KELjm87cy/BWjcfXBGGQ8O14DyEp+xAApMpBlj
+Tq9Q9YkdEX4XhRNU+qD6RUFPA+9a9H8dpeGECQEr6WWP2rhUecqnKFxIkodEJ90z
+mZfMvotH7YIPwtaPNUU2cOEWqWtBS/9iv/WBjQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -67,28 +67,28 @@ KNS9lg==
<ds:X509Data>
<ds:X509Certificate>
-MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
-aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
-MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
-NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
-ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
-MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
-EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
-dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
-sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
-9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
-e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
-i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
-oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
-eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
-6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
-kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
-ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
-WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
-NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
-KNS9lg==
+MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxKTAnBgNVBAoTIFVOSUZSQU4g
+LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSEwHwYDVQQLExhUZWNub2xvZ2lhIGRh
+IEluZm9ybWFjYW8xLTArBgkqhkiG9w0BCQEWHmd1c3Rhdm8uY2Fycmlqb0B1bmlm
+cmFuLmVkdS5icjEPMA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8x
+CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTUwODA1
+MjEyMzM5WhcNMTgwODA0MjEyMzM5WjCByTEpMCcGA1UEChMgVU5JRlJBTiAtIFVu
+aXZlcnNpZGFkZSBkZSBGcmFuY2ExITAfBgNVBAsTGFRlY25vbG9naWEgZGEgSW5m
+b3JtYWNhbzEtMCsGCSqGSIb3DQEJARYeZ3VzdGF2by5jYXJyaWpvQHVuaWZyYW4u
+ZWR1LmJyMQ8wDQYDVQQHEwZGcmFuY2ExEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKv46oStnlmR1Fa6hbCcOlgYZVOUCmF9pjXQDR3S
+yNBRtukPkfw/BxrhwnG0jwEVmoHfV0qgTk7gMjNtrJRoFctRQWLzglbxf1yBMTgw
+Pqwv5pJRslIOXJLytk5oOlNgDAzyW9olb4ZH3ykq96ssGxiBN/OqgeLB7jLcQfE6
+t5fPWA8s7fC3OmLvrf9DR/5JV489FjqrJUA2OqOa3ZYGPsOb7Iu+/ZgS3KzbjK/R
+pKOrV2GJBoRBylSW4QyNSjFHjnKWk5nG8AbArPzxc4Rf196xjgrcG6EUn9MgkN+H
+qK33rLEjPYinVgJhVutl4RPf3crIQnH40RlrfLseDxCnN8kCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAMb1OtL57m0uv+XnYIKq7PCPy+mgyfaEzMSLI6rVLiIcHkA6I
+wc46b67j9mG0xkipDaOci/fnSqA+VaVw8dM2NLOVRUgKLwyZ51jm0OojoIxxoXW3
+yQyvEPC3TxFT3C2aVA6u6HaxutoTc3X1iFN0Chp3RhQO1wUIuEpGoDYA4AzBHgsL
+J0KJhJ8we4MfG8Ykhosw2NGe+3KELjm87cy/BWjcfXBGGQ8O14DyEp+xAApMpBlj
+Tq9Q9YkdEX4XhRNU+qD6RUFPA+9a9H8dpeGECQEr6WWP2rhUecqnKFxIkodEJ90z
+mZfMvotH7YIPwtaPNUU2cOEWqWtBS/9iv/WBjQ==
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 97c6ee49..00000000
--- a/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cans.dev4.clientproof.co.uk/shibboleth-sp">
- <!--
- This is a "CANS Legal Information" Shibboleth SP for Citizens Advice Notes Service Trust.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://cans.dev4.clientproof.co.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAPv9EOsZc3NxMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG2NhbnMuZGV2NC5jbGllbnRwcm9vZi5jby51azAeFw0xMTA1MjMwOTA0Mjla
- Fw0yMTA1MjAwOTA0MjlaMCYxJDAiBgNVBAMTG2NhbnMuZGV2NC5jbGllbnRwcm9v
- Zi5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSTqgatsKob
- /N/yLNTpzDXPpdroAu7JESKu8EtYFCoE/xsQ3IfGxmdNu7lGmSLUwEWnBKJADfZ/
- m7PgbJTmveOR60iU4Xj4jIFJuJsJ2DdAmktb38PyPm3UdqdQ+xXioZFNPurr73KT
- 7KFAZT190TlHtIA3QKf5EZP4sKWHWJaSoN4B59UDNc88glWmhgi2GKfoSnTB7pjT
- Tc+yhjjJOR4fm7k4KF0sYq+IdL+rNnh+95eVl8hjYn1pmQJq9++7V6VtRZnSMmiY
- 6QVnDHl+uCr2uaBqu42t99ERAILWoQLvkkMYoM8rO/0cKd/pyhkZX4v9r+L9Pi9D
- Hf3I5W3q5pcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbY2Fucy5kZXY0LmNsaWVudHBy
- b29mLmNvLnVrMB0GA1UdDgQWBBSRKxbvQylc1QvWonlrXSaOFsTEAjANBgkqhkiG
- 9w0BAQUFAAOCAQEARyhRzBUAOCbEGSiSpMDw3w+d8NKmGZnVZ9t91TczDMqy7fBk
- W9Ez8rkdotdDV2zwLg4zFp2wxQ+q8Llz92gGXQz1RuZpmoyHLsjVG+s9JXvnbHmk
- LIsaCrjY1yrukdFOiY1X0RYlsZ4KZ8oAJfrbI7UaaQ1KDZxox/Ttmc1oCOWHFiUu
- TEgD1oSP9UH1TBUPURnilOhZWEkfmRXgRzm+l7MMilWUnHkh5AP7K6wn9Gb+6b/L
- EuINlP2aR+pgdphLjTLnyHw5ni6O+B+hw2IRX2fyWeK4BsFUmJGZ3WPl/l3R+uzE
- fJd0URqxirZ4982sPAaiW118lw3XxgmkDmtHOw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Citizens Advice Notes Service Trust</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Citizens Advice Notes Service Trust: CANS Legal Information</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cans.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Emil</GivenName>
- <SurName>Muthu</SurName>
- <EmailAddress>mailto:emil@webstarsltd.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Emil</GivenName>
- <SurName>Muthu</SurName>
- <EmailAddress>mailto:emil@webstarsltd.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
deleted file mode 100644
index 75ccd4dd..00000000
--- a/swamid-interfederations-2.0/cas.ent-etrs.net-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://cas.ent-etrs.net/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-24T16:19:23Z">
- <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">ent-etrs.net</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Ecole des Transmissions - Cesson Sévigné</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>
- MIIDKzCCAhOgAwIBAgIUXvJvEuE8bWQyAkG8bh3m7vmoqzgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQY2FzLmVudC1ldHJzLm5ldDAeFw0xMTAzMjMxMTMzMDJa
-Fw0xNjAzMjMxMTMzMDJaMBsxGTAXBgNVBAMTEGNhcy5lbnQtZXRycy5uZXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJPDrl8egS/TqUaTu75zjeaWy
-7EEl0GgROrdoy4vrvKYOmofMHol90Epqd2e6HVhqUOnqWuUhm95lHfThMezBIPBo
-0qOY1QcGstS5allQ/iRY+ODRe3e0CCraHt6JGkckseVDrwlRmZImpJqZkpQyk1Yc
-fL9mlOrnC9lPrN5THoaazjcREicc0crehoyLkzoZzWWP6vzNMmyW2L9zqUqhbWhP
-UG6hZQ4c+pRUpjE+EEedzgMnpPy+M5BNcCRyCUCNwL11EvoYEYhcMNvR1x/qS+l0
-qqNR2qurS7W/hChAbBjyFw0nWzsAwS6NtiUYgjJ4I3uhOSg54hBQ5lqUTeNbAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGNhcy5lbnQtZXRycy5uZXSGJ2h0dHBzOi8vY2Fz
-LmVudC1ldHJzLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUiY4Lpt2DpIZo
-pwRHJPz4FWXDEcowDQYJKoZIhvcNAQEFBQADggEBAFGniMt16npf3zfKPwWo/bXn
-bivyG35m82xTRKspKLhUHkmXYN3ZaKz9Z44DShDGPlpddzaM7vFZqiEPQwu4Cw8G
-c3I06F53JEzhZgD9bScVrvONkZD4Si2WLqBpJX6vld2VJ6ptj+Sp0NpuO68tBYV3
-8kLkqSXtbGoPO+BmYG+1giEDSxIX/trYzzkzCtJgfZbPlnF0osjOl+vcyBdzwBdF
-Ww4LysygxWHWOWMRfDDZBdWiXN5hxqwt2AlXbg7bVUVs6yN077J+Cvrs3fJfSARB
-GE/cxG6DtyEQnF1mr7LZN8U7uNLg0uff90fHQPYL2y0ERDV04Ve9P0DVA0YjWuQ=
- </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.ent-etrs.net/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ent-etrs.net/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Patrick JAOUEN</md:SurName>
- <md:EmailAddress>patrick.jaouen@ent-etrs.net</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Dominique MULLER</md:SurName>
- <md:EmailAddress>dominique.muller@ent-etrs.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..f625e373
--- /dev/null
+++ b/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clueless.restena.lu/simplesamlphp/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-06-25T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RESTENA Staff</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">RESTENA Employees</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="de">RESTENA Mitarbeiter</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="lb">RESTENA Matärbeschter</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for members of staff of RESTENA Foundation</mdui:Description>
+ <mdui:Description xml:lang="fr">Fournisseur d'Identité pour employés de la Fondation RESTENA</mdui:Description>
+ <mdui:Description xml:lang="de">Identitätsprovider für Mitarbeiter der Stiftung RESTENA</mdui:Description>
+ <mdui:Keywords xml:lang="en">RESTENA staff login</mdui:Keywords>
+ <mdui:Logo width="78" height="100" xml:lang="en">http://clueless.restena.lu/restena.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
+ <mdui:DomainHint>restena.lu</mdui:DomainHint>
+ <mdui:DomainHint>lu</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:49.50,6.00</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIG8jCCBNqgAwIBAgIJAPFgloKDS/2VMA0GCSqGSIb3DQEBDQUAMIGSMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MTAwLgYDVQQDDCdSRVNURU5BIFNBTUwgRW50aXR5IGNsdWVsZXNzLnJlc3RlbmEubHUwIBcNMTUwNjI2MDY0MTM3WhgPMjA1NjA3MjAwNjQxMzdaMIGSMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MTAwLgYDVQQDDCdSRVNURU5BIFNBTUwgRW50aXR5IGNsdWVsZXNzLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCn6iqz2ws7axLU+lkTO6YFaTEvtfGmS6HnfacGSgLWN1CKXnu/POeX3UO6bHR4XgdyuKVEju4cTVpEMFoxsgQthiwBQnaBgv1HM/tcMmm+6iPCyt2T36STHeCRlr+ym5qXbPcFI9JFCmSgQpBad9ESH5laM0XRckFBFfCFfYFhShrbDqg8cc53A6767X7hqWPlj5wyfrncoauXeAYbhCwRJnb7Dd5JhB317jmGSy6hxuZ6/W70cToJ+eC7YRo/Oj4ykQfg/bo6UQ9eKAVc7cfujIbjVqeYIc+v34byRzkMn9bhnkDQzG6wm6HyIWinisbvKERO7GJSyWl1Qfa8UNfY/+v0DB3taBOMLfL+Ohf6bFFKJCqpNVJRsJuDg/7LV3oZ/prqFmqeXFNUOuGJQoPGhYpdWZOeMUQ9txQPOQFW0QTprcu0XIFAzNyX+hft2jjq02H/+OmUPZllK+AQSjcr7Jiz9o8bJw73GLj8oqSuyC4y1CBVVs0kBKcBmPH8uItMCnvKAURmUPjD1zeOWM5z8zHjGPodWjrMgjBNfYUJGNjaxX4IbObC59PmqDuJQeXaELHsbM/Kn1juCHKS1fFUdP6ZWqtz+oRas4qc7rLDCqIzksMEOLaHt5WirNJW019ftQE8BteGwkliWdUUSo5gX8Bv96uAjf1FIdH62G+NGQIDAQABo4IBRTCCAUEwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFIduwaoYDe0IeuXZddYV5xloddgnMIHHBgNVHSMEgb8wgbyAFIduwaoYDe0IeuXZddYV5xloddgnoYGYpIGVMIGSMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MTAwLgYDVQQDDCdSRVNURU5BIFNBTUwgRW50aXR5IGNsdWVsZXNzLnJlc3RlbmEubHWCCQDxYJaCg0v9lTAJBgNVHRMEAjAAMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9jbHVlbGVzcy5jcmwwDQYJKoZIhvcNAQENBQADggIBAD0tteBntR0kinB4xMZRmj33+E/YkyfkgTCJrENVgL8K6whIv5zPWmnmC7ntdo4F/T9V6BnhLJUZ7w5hWfMAfU9PkibJOrB4ppGENJmwxK7phj0Gkik86CNucU+vKkHseT6wGietVHnqtCnlAd3K5Ez+3Hu+bJAgnq8dMkZ741sgmj9d9nVEoKm/YHLFRgcZ6VahOyDSalujyxtkrjY1f5YrZSYclUDGjZsRvShndNulxHnjmSGYoCoKkPPC/LkfZEMiuq/lCRLP4cVFAw/1XkQk/yT3JZTikt5vNhn8dPKRh2L6GdGtmJTVJ0M1TSWCjlpHwBcPQdr4/IoEy8QyP66YScGEVPNV96fXCciNdKG7KsGYtdwnBL32NKWcYUcZeNv6gvCEWxFWQHv21nE3d7/IeDUFFaFIiBYNVmrtJUYhpTHnALOwde/4V6ndYEGLN+1D2VdSeLbQSBOVgjUwt7EBmlDzI7XRUVoeQIXG71I6uhc4IqABkpJWdlawTUypy7veS9526/CvaQfPyA8nDTwt+ZoDAH9YwX+EDafQIu94MqGS4VAgub/CcbEHOe2hd1rhvFJ5iCU9Iy1arEdoTMX992/oR5VUIwwg2kVpVJcbIj0rKrcgxdma9wzV6PYIArZkPj92Dz6q2KBaBBxyeLeWQtoMPZsSxgWig6cuU+NI</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>MIIG8jCCBNqgAwIBAgIJAPFgloKDS/2VMA0GCSqGSIb3DQEBDQUAMIGSMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MTAwLgYDVQQDDCdSRVNURU5BIFNBTUwgRW50aXR5IGNsdWVsZXNzLnJlc3RlbmEubHUwIBcNMTUwNjI2MDY0MTM3WhgPMjA1NjA3MjAwNjQxMzdaMIGSMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MTAwLgYDVQQDDCdSRVNURU5BIFNBTUwgRW50aXR5IGNsdWVsZXNzLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCn6iqz2ws7axLU+lkTO6YFaTEvtfGmS6HnfacGSgLWN1CKXnu/POeX3UO6bHR4XgdyuKVEju4cTVpEMFoxsgQthiwBQnaBgv1HM/tcMmm+6iPCyt2T36STHeCRlr+ym5qXbPcFI9JFCmSgQpBad9ESH5laM0XRckFBFfCFfYFhShrbDqg8cc53A6767X7hqWPlj5wyfrncoauXeAYbhCwRJnb7Dd5JhB317jmGSy6hxuZ6/W70cToJ+eC7YRo/Oj4ykQfg/bo6UQ9eKAVc7cfujIbjVqeYIc+v34byRzkMn9bhnkDQzG6wm6HyIWinisbvKERO7GJSyWl1Qfa8UNfY/+v0DB3taBOMLfL+Ohf6bFFKJCqpNVJRsJuDg/7LV3oZ/prqFmqeXFNUOuGJQoPGhYpdWZOeMUQ9txQPOQFW0QTprcu0XIFAzNyX+hft2jjq02H/+OmUPZllK+AQSjcr7Jiz9o8bJw73GLj8oqSuyC4y1CBVVs0kBKcBmPH8uItMCnvKAURmUPjD1zeOWM5z8zHjGPodWjrMgjBNfYUJGNjaxX4IbObC59PmqDuJQeXaELHsbM/Kn1juCHKS1fFUdP6ZWqtz+oRas4qc7rLDCqIzksMEOLaHt5WirNJW019ftQE8BteGwkliWdUUSo5gX8Bv96uAjf1FIdH62G+NGQIDAQABo4IBRTCCAUEwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFIduwaoYDe0IeuXZddYV5xloddgnMIHHBgNVHSMEgb8wgbyAFIduwaoYDe0IeuXZddYV5xloddgnoYGYpIGVMIGSMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MTAwLgYDVQQDDCdSRVNURU5BIFNBTUwgRW50aXR5IGNsdWVsZXNzLnJlc3RlbmEubHWCCQDxYJaCg0v9lTAJBgNVHRMEAjAAMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9jbHVlbGVzcy5jcmwwDQYJKoZIhvcNAQENBQADggIBAD0tteBntR0kinB4xMZRmj33+E/YkyfkgTCJrENVgL8K6whIv5zPWmnmC7ntdo4F/T9V6BnhLJUZ7w5hWfMAfU9PkibJOrB4ppGENJmwxK7phj0Gkik86CNucU+vKkHseT6wGietVHnqtCnlAd3K5Ez+3Hu+bJAgnq8dMkZ741sgmj9d9nVEoKm/YHLFRgcZ6VahOyDSalujyxtkrjY1f5YrZSYclUDGjZsRvShndNulxHnjmSGYoCoKkPPC/LkfZEMiuq/lCRLP4cVFAw/1XkQk/yT3JZTikt5vNhn8dPKRh2L6GdGtmJTVJ0M1TSWCjlpHwBcPQdr4/IoEy8QyP66YScGEVPNV96fXCciNdKG7KsGYtdwnBL32NKWcYUcZeNv6gvCEWxFWQHv21nE3d7/IeDUFFaFIiBYNVmrtJUYhpTHnALOwde/4V6ndYEGLN+1D2VdSeLbQSBOVgjUwt7EBmlDzI7XRUVoeQIXG71I6uhc4IqABkpJWdlawTUypy7veS9526/CvaQfPyA8nDTwt+ZoDAH9YwX+EDafQIu94MqGS4VAgub/CcbEHOe2hd1rhvFJ5iCU9Iy1arEdoTMX992/oR5VUIwwg2kVpVJcbIj0rKrcgxdma9wzV6PYIArZkPj92Dz6q2KBaBBxyeLeWQtoMPZsSxgWig6cuU+NI</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clueless.restena.lu/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clueless.restena.lu/simplesamlphp/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">RESTENA Foundation</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Fondation RESTENA</md:OrganizationName>
+ <md:OrganizationName xml:lang="de">Stiftung RESTENA</md:OrganizationName>
+ <md:OrganizationName xml:lang="lb">Steftung RESTENA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">RESTENA Staff</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>RESTENA</md:GivenName>
+ <md:SurName>NOC</md:SurName>
+ <md:EmailAddress>noc@restena.lu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml
index 96552870..00e8814a 100644
--- a/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml
@@ -4,6 +4,22 @@
This is a "MIMAS Copac" Shibboleth SP for The University of Manchester.
-->
<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="2009-02-03T17:10:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
@@ -11,12 +27,7 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://copac.jisc.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://copac.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cui.copac.ac.uk/Shibboleth.sso/Login"/>
<idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://copac.jisc.ac.uk/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://copac.ac.uk/Shibboleth.sso/Login" index="2"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cui.copac.ac.uk/Shibboleth.sso/Login" index="3"/>
- <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://copac.ac.uk/Shibboleth.sso/DS" index="4"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Copac: National, Academic &amp; Specialist Library Catalogue</mdui:DisplayName>
<mdui:Description xml:lang="en">Search increasing numbers of UK and Irish academic, national &amp; specialist library catalogues</mdui:Description>
@@ -52,32 +63,27 @@
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copac.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cui.copac.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copac.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cui.copac.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cui.copac.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cui.copac.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cui.copac.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cui.copac.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cui.copac.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copac.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copac.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
diff --git a/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 40346962..00000000
--- a/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://copper-beech.oucs.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T10:35:12Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAO1i0mrAIB8GMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmNvcHBlci1iZWVjaC5vdWNzLm94LmFjLnVrMB4XDTEzMDMxMjEyMjE0MVoX
- DTIzMDMxMDEyMjE0MVowJTEjMCEGA1UEAxMaY29wcGVyLWJlZWNoLm91Y3Mub3gu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC19odZWKUryeOs
- Qm5Jped89f7vdvCnl1+Es27CxXYioSRtqBWWWSCmv5ihxDmoTL+aGNdyjf/5m7Ad
- YPzpp/eVvjPtcMN1tHo7L9B6vs/wArIp8mcFK57vfdA+LM8TzMz74OGLrGBuKe6w
- 8BRbfG6amdvJczbZ7PqMJWI4f/3YXGM6aCqHY2L0ZNZf/ZRedTIuDiurk1PH30AN
- PAGilDLIYDakAT/HnRMzoFYDg/Qyom4YQGCF1yIyG4WJAgjhnSnibbVF6C6uNU2u
- BcGbeF+ZLpTZe8T3NoGjZbnamqd8PmoUE/8Iv3ciPWnxpIfEL7hdQBjnYqyuM8s/
- FyOA42uzAgMBAAGjSDBGMCUGA1UdEQQeMByCGmNvcHBlci1iZWVjaC5vdWNzLm94
- LmFjLnVrMB0GA1UdDgQWBBQu40vUe6XSE9/jGWlX6HR6uNg2rjANBgkqhkiG9w0B
- AQUFAAOCAQEAUrxhUkIk/kX4ALnAPV6GtwkMBoq7KMauyCaTyPDEf/VFziwhW8Ha
- 5g2gEVqD2XcTVjb1+IhJHcXcvS6PNbU4XeFDDA4b9Ozu3KZSXFkKzU+tUYcJ7HFk
- WIzImdVpATRsc/rb871QSCsf3NsP9k0sQWCRaMZP96vic88ZiZLM4RnD62BsARMv
- MTiOHIJJN6qRECJAXcw7BPa2Fbb+CJYMy1vG8+a2XKe/B52gmWbBwkCI8xAy9k9y
- MFD+d0ccJvCT04vBA238bfgsEDGo9spUMatdRlvt0fAjS2mkiQM589o1EAwywWjN
- oG3ArnRN398e8bBWJnR3ndIw5Z14f3I/KA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Test Shibboleth SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 9f1bef52..00000000
--- a/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coursedev.conted.ox.ac.uk/shibboleth-sp">
- <!--
- This is a 'Department of Continuing Education Moodle V2 development site' Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-06T13:36:08Z">
- <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>
- <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://coursedev.conted.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEojCCA4qgAwIBAgIJAIo8n/wla25jMA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSIwIAYDVQQDDBljb3Vyc2VkZXYu
- Y29udGVkLm94LmFjLnVrMSowKAYJKoZIhvcNAQkBFhttaWtlLnRheWxvckBjb250
- ZWQub3guYWMudWswHhcNMTQwNTIwMTAzMTU0WhcNMjQwNTE3MTAzMTU0WjCB0TEL
- MAkGA1UEBhMCVUsxFDASBgNVBAgMC094Zm9yZHNoaXJlMQ8wDQYDVQQHDAZPeGZv
- cmQxHTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMSwwKgYDVQQLDCNEZXBh
- cnRtZW50IGZvciBDb250aW51aW5nIEVkdWNhdGlvbjEiMCAGA1UEAwwZY291cnNl
- ZGV2LmNvbnRlZC5veC5hYy51azEqMCgGCSqGSIb3DQEJARYbbWlrZS50YXlsb3JA
- Y29udGVkLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- oVwa9Vpu7YzAf0IQczc4zZBHCW1xsdqfuCVk71ahSnEQMl0QQXcM9ZvyqqDIy12Z
- rA+5y/mGwfYv09M/DqrKqbT7Mk5CaksDjEwnZqobrGX+nKMKh/lKsSeJ/OkWvZbw
- bGR5sIAO88Waz3QQAdouIahycyMxeZxxD6mHqGncLl87tWNng5R1bRTQ3ITMXwMY
- pNtLkbS884EIChs9U+NJyqbiHhX6HCwG6Nn1n6VbKoavM47Cd5mf/2Gl1POYP6tT
- YeTJ1ivUUEQ/KREWkZuGXy1pF5ZcoxkFnJwjaAUo+vxF0WUXSdRUpvlyOgDsnBqY
- A3+nZkUXgZpz/ll88UeBzwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
- DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUCsi1
- iGkuhHJjuS5YZsmf/6hsBUYwHwYDVR0jBBgwFoAUCsi1iGkuhHJjuS5YZsmf/6hs
- BUYwDQYJKoZIhvcNAQEFBQADggEBAJc4oY4qFkj0cJWBLn+9ch6DCLvJvbSmdcz9
- prVUBdKavVISxGlbY4ro3KxAUNdEcmYESW6JKJcu4ek4/L47aVGSI7dX2CQ73DYM
- WAcf6XzFpfEUGw6aOKi7UOYKzVAugbafAb2j1LMQrSt7FEFEtYlGoAN3JnH4+FIC
- 29gwvXQrXRFvqCfoVMfMUGlTdD1Xy9XbakTOWta0cTHtE+p6GRgoy0MpjYmVruUc
- qre2Yz3OMGHP3FghGeUXQrDEzmnAbKW/RjHWrUapTgipkKdokN1JC2C67OCkQOsk
- JD62ZhusHIcnhdoAfDzMtOVYFGLFs4JyeOlfG8MbmY4p1UJJuMA=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Department for Continuing Education Moodle V2 development site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml
index 9c05cd0c..6d83aa80 100644
--- a/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.hmc.ox.ac.uk/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowdskills.ncl.ac.uk/shibboleth/metadata">
<!--
- This is a Shibboleth "HMC Intranet" SP for the University of Oxford.
+ This is a "Crowd Skills" Shibboleth SP for the University of Newcastle upon Tyne.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,33 +20,34 @@
<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="2012-10-02T13:11:22Z"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-07T14:44:05Z">
+ <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://intranet.hmc.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAIU8QGcz0dW7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWludHJhbmV0LmhtYy5veC5hYy51azAeFw0xMjA5MjgxNDAxMjFaFw0yMjA5
- MjYxNDAxMjFaMCAxHjAcBgNVBAMTFWludHJhbmV0LmhtYy5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALpxFuwu20NkTMGvbkdalfQmgkqK
- OYWin+c2AjcyEvYwu+ltFotD3VU0dwQcIIvKzS4lWf8oFY1T096/Xya+ghriVkLO
- /W1pS0D/a/m65zhqLL4Lxm6QQNXWrzXMqsbzCIX/PsCB289VH8U9o+veby1MwqeD
- /IEWkOvnbMo7XdM1NYTjGCbjXj/V1MPsX5MCKCC1qpnKTpLlKCM4IMQ7uyR4gpZ9
- uOYbisoTB6sM5IHhZ1iEPnoMRUc+XVV/2PTXKYvmHFK0nK69WgJTqhHq8JpLDReL
- WMTu1IBX2HkkD4lusDGHbjsnXPMPk667selsm+sdKGS6VZK8rcQeVoHGGmcCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuaG1jLm94LmFjLnVrMB0GA1UdDgQW
- BBQrgF2zSfUhkXvNqRmMVewVsB8BDDANBgkqhkiG9w0BAQUFAAOCAQEANM4f7Js5
- kWP9l88MlcZED8jKgnUU6xzk2/cucL3NWMQHRf3tX5Zx+TQNmCQPrQQuOVnZGBGy
- t0BsjUWnm5EL8L8S2zPacTEXTPwIWZfMCGgfU6ukzf/qOvEEI4HmpwEb3Cyct+kW
- L+md/et04WByDCOYBpI8miBmImtD0ivT52Z5mkqAcQ4kkjI4mmDKux1Z2LE6GjBl
- pdBX86sXKhJFK+sd+W8tH5MhXx/QeQOm59E4lTEqycQzWU1bdSi2wSsfpTdn5QuP
- MG4F8FSqKxqBRa2o7IBGKpQEM+oUTCVgDCGI+CPT56LdiS12JrjrSyPxyNJ1f+q3
- nulyyQrBNsg/BA==
+ MIIC6DCCAdCgAwIBAgIJAOU4R08iVl1iMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+ BAMTC2Nyb3dkc2tpbGxzMB4XDTE1MDgwNjExMDQ1MloXDTI1MDgwMzExMDQ1Mlow
+ FjEUMBIGA1UEAxMLY3Jvd2Rza2lsbHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ ggEKAoIBAQDRen50bMBraKjUTLL/OfCaiv8RcrlkDPSOfPGYWkzp3FPQPA1EURF7
+ cKQYIl+0zmaYM5n14cHIS9IvRAcHEEpdnQBqO94kNRE1DFVaCQw/2dSSafgbunEx
+ Tx0v3dHJv/0X6zacstIYSRj+lyEjuAmoe1PgwDVitlLoN0Qk1jbr8viNlXHgYStG
+ bMjDSxpZg14OqtbYh8GaRpMYoUqVzQrwp08hmDKpIbELTIa+F9idRSRK6CJTN78D
+ OtNpEJuv6i8He5LPSXKcqPJu1n+3sIZi25qistgxc26BF2OgKe5B63PWNCXCWMxr
+ lsgfTzCCXcXl+yP0ysUk7pV0CLH/1FCHAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Ny
+ b3dkc2tpbGxzMB0GA1UdDgQWBBQXuGLwu08yHj34HFP2woB/Wnaa0TANBgkqhkiG
+ 9w0BAQUFAAOCAQEAFLTlZ6Ltm1R3NUmxX2pp+xle22B7STeOq3H/gUW7pkJPi2Pi
+ FJEjS1HnOtoR8dSh/eXWUf6YZsoH1wpSCx+XObNv5iwtcY/JU9CKqMoT6+EXnoWv
+ YLRJF16S500AFuaYRY6VQ1DtpoUhcI62NhzkXc7m8tKgEd/ZOLXQqpyAwho9PKUt
+ C953PAo4fjcv64SRbOFZF4+cW+oRFlbdiLQatPjlYaiHi1W4mVxfVdHpE0XkLm3h
+ 5+qM3/iIDrMFGj8+DITylrq5GN0+Gr9ucyHd8eaaDrQtNoGFqJH2YIiH7nvqLpMo
+ ggaP5VjpxxW0mUDliBDYf/hIcOV9P2sOtxqxrg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -60,31 +61,31 @@
<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://intranet.hmc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - HMC Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.hmc.ox.ac.uk</OrganizationURL>
+ <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Newcastle University Crowd Skills SP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Jonathan</GivenName>
- <SurName>Boucard</SurName>
- <EmailAddress>mailto:it-support@hmc.ox.ac.uk</EmailAddress>
+ <GivenName>Chris</GivenName>
+ <SurName>Franks</SurName>
+ <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Jonathan</GivenName>
- <SurName>Boucard</SurName>
- <EmailAddress>mailto:it-support@hmc.ox.ac.uk</EmailAddress>
+ <GivenName>Chris</GivenName>
+ <SurName>Franks</SurName>
+ <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index 0410b235..00000000
--- a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dames.nesc.gla.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2.2.3 SP 'DAMES Portal' for NeSC (Glasgow).
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
- MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
- ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
- tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
- Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
- fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
- PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
- LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
- UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
- fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
- OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
- PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
- 10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
- LVUfkyIKAQ==
- </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>
- MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
- MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
- ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
- tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
- Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
- fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
- PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
- LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
- UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
- fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
- OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
- PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
- 10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
- LVUfkyIKAQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
- <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): DAMES Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.dames.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c07ae59..00000000
--- a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.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://dev.ords.ox.ac.uk/shibboleth">
- <!--
- This is an "ORDS dev" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:08:41Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.ords.ox.ac.uk/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://dev.ords.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIDCCAgigAwIBAgIJAMTekyIxruAZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWRldi5vcmRzLm94LmFjLnVrMB4XDTE0MDMyNjE1MjIwNVoXDTI0MDMyMzE1
- MjIwNVowHDEaMBgGA1UEAxMRZGV2Lm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCyUaAfy6/+4NEKbLUL7bkZIaaeAZRmerKMSR4L
- mwgueQ4VAO1mVogr3abLNJz3xtXqHeA4+iYKVyvGVBXoqQGl9SeLuoDRPEOQCxXc
- sXxt7fEMpuQfqP7Q3XPvPwSpBuvtaac2kZgXIuHcSZZFJTa4d1aSJFgclzwzGh77
- f7w87Olj85QK1422M2RZq8LDdIcyi/nsqSLHe08Dg9ZiW/yOr22m6mN6oVUz1Prw
- BEnH6WU5KbwiOweVBt7CzHlLQS47fg6a+O3sQlYQsPnjjYYtODYG015gPk+1CNlm
- XM4ji6yHbtY7cEmfIcxUHLajFrXNPkrejk/QbZr3ldcE1kzBAgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEWRldi5vcmRzLm94LmFjLnVrhiRodHRwczovL2Rldi5vcmRzLm94
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFLKTjIENem7hq6zmT3gfDgSqITHf
- MA0GCSqGSIb3DQEBBQUAA4IBAQCUSxq9Ltpxs0hCKwm+L7pv681mUDEeIlGFyVzy
- A9GsMVTXJLh4iK+5hnsB1yxuOr5gyXpumDtThvrUNxs2ilhRFpl6FmSdj4B5e2by
- bRbg/h91jdUuTRh48g9Y1PDD+ni6D672s9acjKqXv62mIAPxGob+2hDOVBHQtLj/
- Yyug3pfNmTJyPkqZY7vEwuvsOvG+LR6z3hQzL/7kGd+OVtbaKYyeN0QDYozdYyHG
- IChAFKDUiO1a4J05jUxLuGcto5ozOFurWGieiptFnhlr68t5vGXunQ55r41+5Ixw
- USr1xa2CyDRm+G7gp/teublqbSKOfBTZ778RRMCK2KQiV+qh
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ORDS dev</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index a9905fb9..00000000
--- a/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.staffsubs.ox.ac.uk/shibboleth">
- <!--
- This is a "Development Staff Subscriptions Site" for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-29T13:49:06Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAMPTupjyLfCfMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFmRldi5zdGFmZnN1YnMub3guYWMudWswHhcNMTQwOTI2MTMwODA5WhcNMjQw
- OTIzMTMwODA5WjAhMR8wHQYDVQQDExZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsIra3HDvpQGik+04o7Hi353+
- 0xtA8JgwRy78IYhWNWr4v0a5B5Ahpsc/i7slwZLHmgZirCdMZdgrDktVuEQTbi8m
- TO7NLo9vra8odrHzHoHmWgvWIOp9Foj6POlPzTNU8snjUMUVNM7ShZ/4jV3H4CGZ
- vd4zpHmfvkfOYPRkWt4VMUdzjs6fpt9hAeSiEZf7XuS/cbkE/0ZGfo7yHDrq8Ul0
- 1iEp+95odJCuyL3qIf8jSgyqJCJP918d5F6SE3t+u4Q1syQazgNSzHePrwCHSSGR
- ztZSJeeNZUexdLOYASL/ysNXWVhP77WGjMVqwU4Zv7f0kpl1S9gH12CEaD/NAwID
- AQABo0QwQjAhBgNVHREEGjAYghZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
- DgQWBBRVSkzRfVG/AW8Ec4VyYVUEwJ1fZjANBgkqhkiG9w0BAQUFAAOCAQEAl4cc
- V+K4waP0sgXUQAaNpl+N0r/2DLg0njCJN0QUiWzqvfan6jJ+5FlUYOqeUtLfuOMQ
- Ikwx9PvFqhoyK+QuP0/9Y5REar4Oinc8xn2nWgpTaKgOcBihdrGeN0k72NbjS+UO
- g81H9RzGsPzWp1rKC+4AmdJFIaWNiqlcg59FKzF4KiVfXfF123mKIiKr/Pj9ir2k
- P1B0Wxj420naHJHUIHG2yt64DwKbWRsMgJCdyT4U3zTr7Q4ycO+cMExw7f2z9LIM
- hvYWVctcejaX+2FYRleI+SzKFzZAT7jAUy1PrYQ7v0MRkBc68iAyycFfStNlZYNF
- tkBUW7bI089WV6OA0Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Development Staff Subscriptions Site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.wiseflow.dk.xml b/swamid-interfederations-2.0/dev.wiseflow.dk.xml
deleted file mode 100644
index e52a0d04..00000000
--- a/swamid-interfederations-2.0/dev.wiseflow.dk.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.wiseflow.dk">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-12-19T20:51:32Z" registrationAuthority="https://www.wayf.dk">
- <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
- <md:Extensions>
- <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
- <mdui:Description xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</mdui:Description>
- <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
- <mdui:DisplayName xml:lang="da">WISEflow dev</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">WISEflow dev</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUA MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g RzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGsw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI 61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEu P0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9 bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u 4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/ 3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5 AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw b3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGsw CQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0f BDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFp bnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjto dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNo YTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24u Y29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff 53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0B AQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsL pPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpG b/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dK P8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV 4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk 20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="da">WISEflow dev</md:ServiceName>
- <md:ServiceName xml:lang="en">WISEflow dev</md:ServiceName>
- <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 3a28b497..00000000
--- a/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-adidp.ucs.ed.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 'Music Studio' test SP owned by the University of Edinburgh.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">The EDINA Development 'Music Studio' test SP</mdui:DisplayName>
- <mdui:Description xml:lang="en"> This is a test SP. It is pretending to be a Music
- studio and if it were a real one you would see lots of exciting verbiage here.</mdui:Description>
- <mdui:Logo height="296" width="314">https://dlib-adidp.ucs.ed.ac.uk:442/studio/images/slogan-small.jpg</mdui:Logo>
- <mdui:Logo height="58" width="110">https://dlib-adidp.ucs.ed.ac.uk:442/Images/edina-logo110x58.jpg</mdui:Logo>
- <mdui:Logo height="16" width="16">https://dlib-adidp.ucs.ed.ac.uk:442/images/edina-16x16.png</mdui:Logo>
- </mdui:UIInfo>
- <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://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAOp8SWyvKcU8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWRsaWItYWRpZHAuZWRpbmEuYWMuZWQudWswHhcNMTAwMTA4MTUwMzIyWhcN
- MjAwMTA2MTUwMzIyWjAkMSIwIAYDVQQDExlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MJyza/0LLunZfz
- Qloxx+Lhuc17o+r6J3/lJQYKyDbDxA5I325cDTjO/uHWKZOMCvwJ2Ei+Vyo6amDU
- MTGh3fkpnxuo49ZFtl3+m7/F8TqnxtLg9dC7MDgcbV0w7LOhMKAuW7YT/fHRgC1l
- czXaiUCknsh2ZThg7nVxdyPpr06hzjW7GCnOeEyq9Ye7U7JiVIOF9v0PHtLDrEm9
- 0xR+cWM58mmk/DWublCdqlRDQMU9K6MJmNDwa54sIEl7uj8C991n18In/xPZVln3
- +KpPbdiAOoZ4VquNg9UMgyoKmpjRsThNTzcw4z3clD5vQsFG4966kbf38AZ0/KMb
- rgeN1wIDAQABo0cwRTAkBgNVHREEHTAbghlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
- LnVrMB0GA1UdDgQWBBRIF+Yh+lFwNDPMK7mU3bmoKmUsSjANBgkqhkiG9w0BAQUF
- AAOCAQEAQPhbKEcjLNJkWri6phLQ3rf/gegyBfrObo6xdp051/r0ae38XHH8LnSo
- 3ittwFkFVFZ0OLJ4qj5V4UP0jxfRseAP+FYa3TxKHVFhSXKfEk01DWH1mBwus4K7
- /jSVtxkdA4dmTeT9MDqyeshNOXxihOvWUrLaGew01DIFyIrtovTerU0wviLw+rcU
- Ev39GsLAtk0xVUFmbP2jWJK6oY8TF99bMPDz/BIjmYFtQUiwBSxvgFgrrlhu2eoo
- uQa45TasJ39hrEkVZcksB1AlaKnQBbE3AJFxFcnjal6K62WGCWhXRlK+Z6X+Hs9F
- p1K0c9zlYflwJQRiinQLgUJ/UCNDJw==
- </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>
- MIIDEjCCAfqgAwIBAgIJAOp8SWyvKcU8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWRsaWItYWRpZHAuZWRpbmEuYWMuZWQudWswHhcNMTAwMTA4MTUwMzIyWhcN
- MjAwMTA2MTUwMzIyWjAkMSIwIAYDVQQDExlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MJyza/0LLunZfz
- Qloxx+Lhuc17o+r6J3/lJQYKyDbDxA5I325cDTjO/uHWKZOMCvwJ2Ei+Vyo6amDU
- MTGh3fkpnxuo49ZFtl3+m7/F8TqnxtLg9dC7MDgcbV0w7LOhMKAuW7YT/fHRgC1l
- czXaiUCknsh2ZThg7nVxdyPpr06hzjW7GCnOeEyq9Ye7U7JiVIOF9v0PHtLDrEm9
- 0xR+cWM58mmk/DWublCdqlRDQMU9K6MJmNDwa54sIEl7uj8C991n18In/xPZVln3
- +KpPbdiAOoZ4VquNg9UMgyoKmpjRsThNTzcw4z3clD5vQsFG4966kbf38AZ0/KMb
- rgeN1wIDAQABo0cwRTAkBgNVHREEHTAbghlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
- LnVrMB0GA1UdDgQWBBRIF+Yh+lFwNDPMK7mU3bmoKmUsSjANBgkqhkiG9w0BAQUF
- AAOCAQEAQPhbKEcjLNJkWri6phLQ3rf/gegyBfrObo6xdp051/r0ae38XHH8LnSo
- 3ittwFkFVFZ0OLJ4qj5V4UP0jxfRseAP+FYa3TxKHVFhSXKfEk01DWH1mBwus4K7
- /jSVtxkdA4dmTeT9MDqyeshNOXxihOvWUrLaGew01DIFyIrtovTerU0wviLw+rcU
- Ev39GsLAtk0xVUFmbP2jWJK6oY8TF99bMPDz/BIjmYFtQUiwBSxvgFgrrlhu2eoo
- uQa45TasJ39hrEkVZcksB1AlaKnQBbE3AJFxFcnjal6K62WGCWhXRlK+Z6X+Hs9F
- p1K0c9zlYflwJQRiinQLgUJ/UCNDJw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
- <OrganizationDisplayName xml:lang="en">EDINA - Music Studio</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Rod</GivenName>
- <SurName>Widdowson</SurName>
- <EmailAddress>mailto:idp-admin@steadingsoftware.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rod</GivenName>
- <SurName>Widdowson</SurName>
- <EmailAddress>mailto:idp-admin@steadingsoftware.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml
index 85b57ac5..8e882b64 100644
--- a/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml
@@ -9,13 +9,20 @@
<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="2013-08-06T15:47:57Z"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-06T14:49:53Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
@@ -46,6 +53,9 @@
</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"/>
diff --git a/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index bd9c6818..00000000
--- a/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://docs.nsms.ox.ac.uk/shibboleth">
- <!--
- This is a "docs.nsms.ox.ac.uk" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T11:38:17Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJANItM4swegV3MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEmRvY3MubnNtcy5veC5hYy51azAeFw0xNDA1MjAxNDI5MjVaFw0yNDA1MTcx
- NDI5MjVaMB0xGzAZBgNVBAMTEmRvY3MubnNtcy5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAL7Qbx7ncFti/2duYSv5uq14whnJpO+qUUP2
- 3rbm2//RoT7CfGdrAwTQm/kBtHqCSP6e1HeKPDshMDq1Gu0ZgVyOcnDhML6go3YS
- beQZEK9LEktW9wYxKk5S7GTsUZyeosN1ZJZQ93NVj7vAdGblBxiOV5p1WExicnDK
- KzJ1fcHhfemiWbQ28tF40Jv2IVCW9qecAXrt4CNHFrFXLWrmmMiWxjq+odgnjddN
- C7B9c6eJTzEj2uPvlBW20/Ucfdxats/OSrVuajpn8BdglxJkzy1aqIp2uy38x4oD
- EqHPpE67+eORgTtMH804zPKVazBxEwqoyeyaqDzCgs3AZ/AK5v8CAwEAAaNAMD4w
- HQYDVR0RBBYwFIISZG9jcy5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBQ/WjpW4JfV
- 7EorqP5jmbOILrvUqzANBgkqhkiG9w0BAQUFAAOCAQEAFCIv7u9pL1C2ti8k9KOn
- Kg3CkOjZaeEtLHwIceZHDJvWQGbetLei6ptF4nAxvVzW/g7niVD+U0omv16bsONL
- quEqQhmcwzQJnjkVO0BRAX/bB1/etiLFEQ6eJ+kALjKD44NlwpKytTctq7m7OqRt
- bu6Tr5qTzkzvMJGQj2ct97ODWxUfSH52TPEqrJpEMdnTToYt6zC8ScZ11bNkyIoC
- gPHcIH6KX4EXVZT3lXcKNL821unbxEM/V70BEpj+IXyoo8Jfls9ZRkplTaEYrKg0
- hebx/WWoxPNmAaI8XGblLDzmXIN1nhZF0imrHYBzMRbMJUyOTnvB2fUQIDiSQB6c
- +g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - docs.nsms.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://docs.nsms.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml
index b2ddff8e..4bb66215 100644
--- a/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml
@@ -74,8 +74,8 @@
<EmailAddress>mailto:j.acland@qmul.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Kieran</GivenName>
- <SurName>Whitbread</SurName>
- <EmailAddress>mailto:k.j.whitbread@qmul.ac.uk</EmailAddress>
+ <GivenName>Jez</GivenName>
+ <SurName>Clark</SurName>
+ <EmailAddress>mailto:j.p.clark@qmul.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e594d1b4..00000000
--- a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drupal-test1.admin.ox.ac.uk/shibboleth">
- <!--
- This is a "IT Services drupal-test1" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T11:32:32Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAJLwYa1nUjhIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG2RydXBhbC10ZXN0MS5hZG1pbi5veC5hYy51azAeFw0xNDA2MTEwNzM4NTZa
- Fw0yNDA2MDgwNzM4NTZaMCYxJDAiBgNVBAMTG2RydXBhbC10ZXN0MS5hZG1pbi5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCrjkmZs9yt
- nETaaTxuF459aLEF5H12+vcuwsR662oNVitQqHO1XUUd5KVJ2502H3tpWZbT0rWA
- wnv0nwHB14gm4evKInO/Da9yojWFUtOFExHqePyDfOQZyKb3mAlpRrQAtCpELTjq
- Zr0HTht/ODhsmCKdRUzsNDOld6X7HYU834DoQoZCGpHuzDK/Nj6C9gweL1Uxn1RB
- kVd2t+5/nU0aXSfyMmL++H4kxPDEYEcyZpz2xCwZDfqbSiMn2mltwxUM6Pl5YnwM
- TMvEN9BiWdhTSckqWoqz9pxbJePM2k4kH2tm+v2oHRlC2/hKEtOggKTyeqdQxryK
- qqj85s6HZa0CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZHJ1cGFsLXRlc3QxLmFkbWlu
- Lm94LmFjLnVrMB0GA1UdDgQWBBT8QD5mvc4hICi5sUNX2UZ/9hDmKjANBgkqhkiG
- 9w0BAQUFAAOCAQEAgQLx3imjfSX3QxSJqZPHuzLFoygwXm2EWm5m1LR8aUl1WWIo
- 2CwZR7wMZ0pVYiBJgYqwjkNpozJ1f6Fr9F48o/sSDG673zxjFbOAxLm7nTHBvc39
- qIMNxvOmhl8f/A7gT+OnR+dmVfPI42BrHhUEAOSTmkTRRT1jV6WHKNwXjqngYqD+
- EOASg50rUobY9bF+6k6vGhWxTBAS+UcBUsTGiGU9cDS1cuFpONYixQB7cYA++1SR
- hxhDEKXAC6V3xfJiCLPEcKBaKRyFh+ImaDfcqWjollm0Y2xd/uF1/Tg8AMxLslGw
- PI60xEImflkCgUGXgjTfpKljm+bcaUKAnUQMpg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford IT Services drupal-test1</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
index 5325e9f1..78b7ea01 100644
--- a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
+++ b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
diff --git a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c6ac57f..00000000
--- a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-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://eeyore.sjc.ox.ac.uk/shibboleth">
- <!--
- This is a "St John's College NAC" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-08-13T16:03:21Z"/>
- </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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDADCCAeigAwIBAgIJAOXHkHR5abqcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE2VleW9yZS5zamMub3guYWMudWswHhcNMTMwODEyMTAzMjIzWhcNMjMwODEw
- MTAzMjIzWjAeMRwwGgYDVQQDExNlZXlvcmUuc2pjLm94LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBOxdHKNQUD0B0kpIWMJEcpWgLxC1/S6
- ZwH3owCAJnqwS8qtJpZWr4peEIDYX4E8uGNEubxui5ioMWxy/UAuUmWfcFoqZ6hV
- KKT82iVjspi55puGb7SgBDWqMcQt/S03bVAl5XEJqmLg0L3kZSj1pCdUFijRTUPL
- 477LhTyaoZqCoTbnIpKkVUh8UjeIjco6pIhDv/bVTqSkO920lUVx8cnamZPy1jXG
- tjAEzZxcpAH8zSXwkuffxNFWT1u2yhssIt1fjIGoO0DuJme74Ls3O8vP10Rl/gkh
- 0eGSvGlERCfQcM+KGu0xmHzLfd2vi0GtMYQYe03xFDOMGoUZW6P0iwIDAQABo0Ew
- PzAeBgNVHREEFzAVghNlZXlvcmUuc2pjLm94LmFjLnVrMB0GA1UdDgQWBBR3TJq8
- XWc8yOsnJiEBJAzZm09K9jANBgkqhkiG9w0BAQUFAAOCAQEAHnBwN4rEVqh3b2Jl
- HntNXIGqths1B+mdHXFEyWs8WcE0NZHp4Pvom4DYyWmwy2td4MaXwY4iEQLQFNCN
- TZvcXjREowzMEu5Sx7odpGTffsJPMDhVzZpRYR5P3NBh4RxirdIS6NYec/bIf56I
- 4SqpthhygQU+TIz8CKekAe+9HI10m7iMxAnvSddcIR9dk9Zc56waQoynoE0lBo82
- aT93LqeJd5zMxGEaSoZrxCsoOPW4zYUrHFNqQkmgKU5PMK1y7RIkERB4HTEl4QAg
- b0Tcl7t7OcEG7lKUdAjOqW8E4DgrdSqzvhQCRI2rm2bKqpHq9CIMXFLlGITTKKOS
- 1FZTdQ==
- </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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">St John's College NAC</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sjc.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Matt</GivenName>
- <SurName>Jennings</SurName>
- <EmailAddress>mailto:it-support@sjc.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Matt</GivenName>
- <SurName>Jennings</SurName>
- <EmailAddress>mailto:it-support@sjc.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml
index a3fd9cbf..47b75960 100644
--- a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcr.new.ox.ac.uk/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://endicott.law.ox.ac.uk/shibboleth-sp">
<!--
- This is a 'New College JCR admin host' Shibboleth SP for the University of Oxford.
+ This is a "Faculty of Law" Shibboleth SP for the University of Oxford.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,38 +20,39 @@
<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="2013-11-06T14:29:24Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-31T08:55:43Z">
<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://jcr.new.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.law.ox.ac.uk/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>
- MIIDHDCCAgSgAwIBAgIJAI83ga/ABB6dMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEGpjci5uZXcub3guYWMudWswHhcNMTMxMTAzMjA0MDUwWhcNMjMxMTAxMjA0
- MDUwWjAbMRkwFwYDVQQDExBqY3IubmV3Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAvoS72hGDIl+GbpfaZL0UOlgGgFcuhaVeqX55D1qa
- 8iloWd33o/c52UZEezMCA8DDlUeD4tZhomLRyXX4ZEzKGtigDhJ+fZbo5JgP9lBh
- pF6L9WoHRGlNO8VaiRM9Imu8sO5+btTfA1rMeVXCmG/NftOG8upXG6RNKB+ccakY
- m5mbe2ecDBy6r58usRIFqZK/4/My3LWU288l33bOE6r6tUCpSyW81b1sEWpllY3Z
- B82hAbOEXQD4ozVURP6QJoID+kOQFRIyzvg9FXfMCoPuUWdboJW1hv5BmZWt9MOa
- UmE2UVqYYvvEmaOT65suW3OTyMiOnt48A3fFi98MNKebcQIDAQABo2MwYTBABgNV
- HREEOTA3ghBqY3IubmV3Lm94LmFjLnVrhiNodHRwczovL2pjci5uZXcub3guYWMu
- dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaMxyJ9eSM7u3SF3NXi1HGMaHYFowDQYJ
- KoZIhvcNAQEFBQADggEBAEl38kBgp1fMgU18W6ChrzZm8EoQiBIOSdScErmZ6XCr
- Va99wjy8bnI/7q5KhXvoJyemNbpIK3c80zFzAdHNkZ6uMhJfyU53Ur8PSzDCNFrO
- 7uGDj/N4AXqZWuHATG/lHXp7icK+LsgNhhCdqsKCTl9/JBiU9lNR1fR+hliLzEYW
- R6X5dggs8sDIZPju4N0Y/Z8OuvlWwV60zbX9YJG5nr/CnccPblaYPmL5Don0DP8b
- VUZfweYVy3ttIKxcB2s5AxK4AtXzsKxkiSjPJcaH5cKJQqGGe4tKvDBjw2tS1r+t
- onpvIhg5z9yn4KlD1Bc4Zvi28xZZVC4yS0Js/3rxhHY=
+ <ds:X509Certificate>
+ MIICvDCCAaQCCQDPOP0c1E12qDANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVl
+ bmRpY290dC5sYXcub3guYWMudWswHhcNMTUwNzEwMTQwNTIxWhcNMjUwNzA3MTQw
+ NTIxWjAgMR4wHAYDVQQDDBVlbmRpY290dC5sYXcub3guYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjDXpqo4zWDraeOC5J2LRYoRHpbAEyhi/X
+ Q7qxFJabs4zpBnwN/MotZfJvMfeckjXfSXB32ZsA7xTJsz0ATiyRkPzlHTUhg4Cb
+ 1hCzN8+9qjkDEv8+rASx3mklqs+xQYqndiF+4jYySsW/I5F9fM4gcP7wqvjNvQhh
+ Ymdsi4xmvfeioTUnL5Qj7nuqE5ZJ23VpdFwK1J6TY8HlcMM4eLsOaPvbbK2HJYdx
+ IPw95cHsBn3tJAmHsfZIgLCOLpGDH6/4cGOJmhPb7RqFdPScsbCj2y6Vek7z0pOt
+ XtWZCONTeFnIV3NwxFtjmSagisAQnKBndBS3PM9odcI7xxHggVuHAgMBAAEwDQYJ
+ KoZIhvcNAQELBQADggEBACcZtLO5WJdIsF6jnRl0Oc3bRcS6uf+ALt3sfn+sfiFA
+ vcVboFHyRdZBcwuIKxquFEXsNdJUnTVWO0isW+0tfhREylrMgaPOEEDF5nyJ/Q21
+ TyU7w2njEwaaJnpT+rTk0kXlCXo2yWcXtez5g2lLpKukJFJzHQ6QTsLn0dX4GJbH
+ L0PkH5ImeAK4UWWNSu4GZAaK8xIOqk84r/ufUlNcPaaPCxqOX17llVE75RthGHOE
+ 0sWXfyg3Rw/DLkJzth62iBa6pyCaNy3KPCtj7X/ua5fKfdup56222qtRquJk9xNt
+ oEFtIts/B0ftL3b8GsrzfT519awo5S4xmaSLDjehnNc=
</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"/>
@@ -59,29 +60,31 @@
<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://jcr.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.law.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR admin host</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
+ <OrganizationDisplayName xml:lang="en">University of Oxford Faculty of Law</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.law.ox.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>IT Officer</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
+ <GivenName>Steve</GivenName>
+ <SurName>Allen</SurName>
+ <EmailAddress>mailto:steve.allen@law.ox.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>IT Officer</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
+ <GivenName>Steve</GivenName>
+ <SurName>Allen</SurName>
+ <EmailAddress>mailto:steve.allen@law.ox.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 66cb3726..00000000
--- a/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.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://engs-web01.eng.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth "Engineering Science Synch Portal Main Server" SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-05T09:22:44Z"/>
- </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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJANQNL49idvBrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB4XDTEyMDcxOTEzNDA1OFoXDTIy
- MDcxNzEzNDA1OFowIjEgMB4GA1UEAxMXZW5ncy13ZWIwMS5lbmcub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9jbGCzmHl3ERccTim8QY0
- NZmYT7sUvcN950gp13qRDPNO7ceYoeHiU313RyrSlk5VPNYAsT6MqS8UlK+ay8g4
- Jloi4kUBFkUk+U1Pj2nC9qw0tll/ogmB8tXrPUXcOYhXI+uUVSDj892IUyMElNUk
- 3nldP+J0qA0//+SNFSrCHd44ytJ/bcAfBgL+HzDJn0bgCfGu1xPm7g1AfGUOpbyE
- eta2BFLbqRhFTzNTdnCQkJixHoM917tvtxie4t9QsegXMJOcYpQRzZ1RE6QrSJsR
- BB26tXX+3tC8aseRhUITN13m+wTrj1SR5pZk1jrctUHKwYZ2GcV+dZ+1dacOAdfp
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB0G
- A1UdDgQWBBR5snO7Txci4muSWxMZnmooKdVrmzANBgkqhkiG9w0BAQUFAAOCAQEA
- NJrUBIaD/R5t2jC58UrsQFwA0aI0Ph/oQqWDDdoXPZ/tgctqO31Wi9raeYp/H/Ge
- ZGDP6Rjudy1wWSEcRqu0VF5ZNI4uJ/7irMbWrlSlQhpdodJuOamUPqUm+yAEI//V
- YgTB2F+FGrbNqTZjnY3GozCD3ZpLoHM7Y5Nl00g7vhCa3NSqXijAup2aaNfJJRKu
- cWFdxBdzzqeABGZYH9herzoSZkFB6fCdhQb/blccGiOev+5g5c5ZnNAEb7wQPCca
- fZRIPt9mAORaBZ8QrLddGgfdw3rq5NvXppbAXxo79OaMlwnkMD9n0hQ5FehL5y5e
- 6dl8d+0ivNjPUDcvd0ZLzA==
- </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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Engineering Science Synch Portal Main Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Engineering Science IT Support</GivenName>
- <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Engineering Science IT Support</GivenName>
- <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e45d8de5..00000000
--- a/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.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://engs-web02.eng.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth "Engineering Science Synch Portal" SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-05T09:28:16Z"/>
- </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://engs-web02.eng.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAPZQTWtL1gpBMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2VuZ3Mtd2ViMDIuZW5nLm94LmFjLnVrMB4XDTEyMTAwMTA5MzA0N1oXDTIy
- MDkyOTA5MzA0N1owIjEgMB4GA1UEAxMXZW5ncy13ZWIwMi5lbmcub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuJ5sgm8gUZwskOGv95l5A
- u0jq8BVNM/myMYBWPWLXpSCsAMZikQ1tkmg9pj9Skr9WVinpLNs7mtSwyp+z8ngi
- XmgMb42iym1EaS/PbHxbdrRkM0BwjHNkMA+hXfZ5mS2lZd86pLXAbBStH8r6Zfz7
- f0ebULyv3lA1K+Iy/04FssusWFprGgAiG8hPF5PSk5pWlQLX3CTPK9j8HDJ0nZ/1
- pnt4W7OTDgs00e0uLodx0uoT5VZWNWhJ3oVdPdB2MyyT01QY3V0B7FKMm7PaSOz1
- WpxIn111cPf2NRh/OkdxU1CEpgPtECuRETWJiH8EnIglOmnzBt+YNOFZke3o0EVN
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDIuZW5nLm94LmFjLnVrMB0G
- A1UdDgQWBBTAlDRr8FU/W1V5loiAcviNc90aGjANBgkqhkiG9w0BAQUFAAOCAQEA
- YcZHhS4wvOHeSa2jrvYQdt3/ojRNilzu9UOIqlTEkQKNG4NFu6+bchqE3FVoRN+X
- O9esYL+kpD2PtTgzND6ag+MZrFmOedXOX9E1w9gMyFyH9EjhXNrr1BZVWD6KOuh7
- LCX4nIPzTqwf5naBgPeM4EWcPHt2DFH9tQXttVZURn65gCzYjdjpTJU4nuu23wUW
- RdGvfx8n9D93wK/BQ8VXI6dXmldl3+3dgfSRBtewCp4/jmTheXang6OrS3eMHruz
- 6e0flNky3LOCnUCbMSmT1NzyrYqXVw55MtJMwxUDIT8CT1T/6IdFI+ux6IBc2ZGI
- EYQ4Ag/ODAxvW2NDIgXr5Q==
- </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://engs-web02.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Engineering Science Synch Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Engineering Science IT Support</GivenName>
- <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Engineering Science IT Support</GivenName>
- <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index e60415f6..00000000
--- a/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://enroller.nesc.gla.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2.2 SP 'ENROLLER Portal' for NeSC (Glasgow).
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAOo3G2vF7X0FMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2Vucm9sbGVyLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDkxNzE0MTgwNFoXDTE5
- MDkxNTE0MTgwNFowIjEgMB4GA1UEAxMXZW5yb2xsZXIubmVzYy5nbGEuYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1sYYn11DWBxLmEvcWLkDA
- ZiDpFxuCO1TGxzuTw/1q86VR0Gaupv77C2eCQuD3sjAwxk4Nl7bV1t8vfK8XAGeC
- 34xoAQjHJhOp8+H6g2i4FTGugI4tH4z0+TdXyzHWbFxL/cr2f17opzlldQSzCqRB
- Bdi+H4qY7a4t/UZqXwLm2TxN8lFBODlaONLE/FyYtWQRSNBdvz3/XKl3eSQyOITv
- FpD3X57AjR7q8KB6J4qtFIa5bwCIemfRjL0kPi+Imreh8vBYoPRCw5Pjte1XTlAc
- VF1f4FDpOcWC6yfgACTMDjAb1+9QBVuSLlcrC81l3ynKrDz2/IW+8FVz4ZFvB4aB
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2Vucm9sbGVyLm5lc2MuZ2xhLmFjLnVrMB0G
- A1UdDgQWBBQIgPGsNFh+L38QqY45owJxEVFz5DANBgkqhkiG9w0BAQUFAAOCAQEA
- Scp2FbOCuWz7i8wXXfhZO2A6L7oZnpHs19fhc1QsBixoMo8nK1rzWdHH7L9uX6NQ
- LHX2gPTRhxeWu+tna8T4k0QanV8YyciQ+QuCdk4V/9pfaQgiqbCQ/NaX9czUusfY
- PNC7Fmgw7A9F0OX4chyMylBWPKVwrVqi8xWxKuxKzUOV66HgesgZaw67tj2eOYLv
- lXzRdcVw7afVvGGj5KbuxJKJFK95wToSMn6V4gdwEt8Q2PhKhKTf5+8OXmOJUXsz
- nG8OLGCO2cYCCXYsaYyEAgSeC8R/xoE7fxVqav1OcaWepi8c+Wtj5EHL1EI6rEjO
- jgViuQCUreNnTkGNNV//Wg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
- <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): ENROLLER Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.enroller.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5dd4022a..00000000
--- a/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epos.some.ox.ac.uk/shibboleth">
- <!--
- This is a "Somerville College EPOS" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T09:53:25Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAIeX2OzTvmynMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEmVwb3Muc29tZS5veC5hYy51azAeFw0xNDA1MDcxMjE5NTZaFw0yNDA1MDQx
- MjE5NTZaMB0xGzAZBgNVBAMTEmVwb3Muc29tZS5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBANoYLxr0nZQXjMkLpIu8EdDajPHthrne+eWK
- oF12T0H5RYUw0YE3pMKwK3VWoXHdRzH4ePvND1PW7lTOHTiNtausoL8QlhrPFFQz
- 8AC3EXaBHyq+jVRxNMxqhCtVj72luACc4zA/cRsogZeYZPF4KlmpBA8KCqr1mCmM
- 6fxup0StnVye/crUmEqg7dYWEIqR7mIMZWi4QLV/VMEV5UOX0KU4Qm7Pu7oTNtL3
- bLUIE5bXsGhlvzF86jCxO9Y8NKSlFKUaddBUjVfYqUsEu4oXQSTlMmSVD3djy8Yc
- ncy2uY3JELglba34miJSBoQvnw6uoKWU2LmMyNaPs6RV8xXULlMCAwEAAaNAMD4w
- HQYDVR0RBBYwFIISZXBvcy5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBS4MB3W4HW8
- tZYm+obee7zmUo9IEjANBgkqhkiG9w0BAQUFAAOCAQEAPr/z/iLjWcFujxOYgHR+
- bg0I7OYGQzDVhED0ECK8sQuNMS3oQBqQPp601lgIdaQVBbQRB7hwdp8wm53Zhmqb
- SgqmfLmzaW3WU9YXNLE6082liVKhchZbhSSq0SjglXNlxlTcAGtkBESjfHH5K6Se
- OL7WxfOEJkc4jY8haTScAZ+wFcUFbuWtxpfz0nd2OfYn7qkR2jo3J6e7FCfXzR1C
- 6ZCffO7hx2tmAfC7gPRWLKV5AHTJ/tkgLAtH80nepDjZw586qjywlEBM7qYI/GlK
- XxF0pyDgcq3CujFb3JC3x5aIEq9zFiy/6R7bZhkuCSCgGA/Ey5RPXslWSgQTyF9i
- CA==
- </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://epos.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College EPOS</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml b/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml
deleted file mode 100644
index 5ed619f6..00000000
--- a/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://espresso.ltscotland.org.uk/shibboleth">
- <!--
- This is an "LTS Espresso" Shibboleth 2 SP for Education Scotland.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRDCCAiygAwIBAgIJAIeqTze25mL+MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmVzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrMB4XDTEwMDcyMDE2MTk1M1oX
- DTIwMDcxNzE2MTk1M1owJTEjMCEGA1UEAxMaZXNwcmVzc28ubHRzY290bGFuZC5v
- cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuCr8tj+kHF4ZP
- 1x+WJSl4h9zsrALKUwz90Nx8ZGBBfcO8LL1T5/8r3xO3uJgJNDVaLCQ10j7VgwQf
- i19HjPBElKtCPcGDyvJsTR6sCijXWjDZUfXlKgL5wTrGdGCqGrfhD0ZLW8y20LDx
- s2XW7r60/sgrF75YnqpBSPy3kFc7lrZTDfseFyafA7KshjHfll7NVsKCLfXPKLuY
- R+MCwl2BYi94Bq9xGPSsTQdvIxphcq5yZYWXFLnqa9Knus/7+2bWVxaNao9xRahp
- N/+NhXv1ECz1xvTxVc7f1746aIqSEDW02QEHy3s7pmDfPUDsdIcDOO7vd4t2g9Rp
- ngyRSm+JAgMBAAGjdzB1MFQGA1UdEQRNMEuCGmVzcHJlc3NvLmx0c2NvdGxhbmQu
- b3JnLnVrhi1odHRwczovL2VzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrL3NoaWJi
- b2xldGgwHQYDVR0OBBYEFJki6pKJFO2mJGvIV+QAKyDPpmzbMA0GCSqGSIb3DQEB
- BQUAA4IBAQAdecqQ0xQkgDOtpHwjWDldS9PbQFVTcWX7tTwhRb+TtzcUQOa+mFAA
- TPkSFIWO8jp1L6llQxyKWdqDFJm3bTmpDj9WcRkG/5wjl0gTmeZer0bMCwIaC7EZ
- hbAQy2Ugv/ie1DFU8Utm0jVIKLOMNa+KbuqNkAfuOwl2PdEbyn0sJAiiIgKlbHqa
- yr7UZjtwW2H3Mwlp8GZILKFmvQLxKMtcnp3iPSrqZNtsRvPtQ8Qg3NL2CmczwdBm
- nbxqu2CEkRcRfZf1pHACgSR44DkxX52pa9MfHd00Z/PnmctS1+m4FDR/FglcgWhq
- kjnnl+e0Q+6WhaKDvcT5wPGT4x0SH1CK
- </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>
- MIIDRDCCAiygAwIBAgIJAIeqTze25mL+MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmVzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrMB4XDTEwMDcyMDE2MTk1M1oX
- DTIwMDcxNzE2MTk1M1owJTEjMCEGA1UEAxMaZXNwcmVzc28ubHRzY290bGFuZC5v
- cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuCr8tj+kHF4ZP
- 1x+WJSl4h9zsrALKUwz90Nx8ZGBBfcO8LL1T5/8r3xO3uJgJNDVaLCQ10j7VgwQf
- i19HjPBElKtCPcGDyvJsTR6sCijXWjDZUfXlKgL5wTrGdGCqGrfhD0ZLW8y20LDx
- s2XW7r60/sgrF75YnqpBSPy3kFc7lrZTDfseFyafA7KshjHfll7NVsKCLfXPKLuY
- R+MCwl2BYi94Bq9xGPSsTQdvIxphcq5yZYWXFLnqa9Knus/7+2bWVxaNao9xRahp
- N/+NhXv1ECz1xvTxVc7f1746aIqSEDW02QEHy3s7pmDfPUDsdIcDOO7vd4t2g9Rp
- ngyRSm+JAgMBAAGjdzB1MFQGA1UdEQRNMEuCGmVzcHJlc3NvLmx0c2NvdGxhbmQu
- b3JnLnVrhi1odHRwczovL2VzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrL3NoaWJi
- b2xldGgwHQYDVR0OBBYEFJki6pKJFO2mJGvIV+QAKyDPpmzbMA0GCSqGSIb3DQEB
- BQUAA4IBAQAdecqQ0xQkgDOtpHwjWDldS9PbQFVTcWX7tTwhRb+TtzcUQOa+mFAA
- TPkSFIWO8jp1L6llQxyKWdqDFJm3bTmpDj9WcRkG/5wjl0gTmeZer0bMCwIaC7EZ
- hbAQy2Ugv/ie1DFU8Utm0jVIKLOMNa+KbuqNkAfuOwl2PdEbyn0sJAiiIgKlbHqa
- yr7UZjtwW2H3Mwlp8GZILKFmvQLxKMtcnp3iPSrqZNtsRvPtQ8Qg3NL2CmczwdBm
- nbxqu2CEkRcRfZf1pHACgSR44DkxX52pa9MfHd00Z/PnmctS1+m4FDR/FglcgWhq
- kjnnl+e0Q+6WhaKDvcT5wPGT4x0SH1CK
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Education Scotland</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Education Scotland: LTS Espresso</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ltscotland.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Graham</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Graham</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8a4019a1..00000000
--- a/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ethics-gradient.oucs.ox.ac.uk/shibboleth">
- <!--
- This is a Vidaas Project Shibboleth 2 test SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIERjCCAy6gAwIBAgIJALgZeahxwEy4MA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
- VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEL
- MAkGA1UEChMCT1UxDTALBgNVBAsTBE9VQ1MxJjAkBgNVBAMTHWV0aGljcy1ncmFk
- aWVudC5vdWNzLm94LmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpkYXZpZC5wYWluZUBv
- dWNzLm94LmFjLnVrIDAeFw0xMTEwMjUxMDAyMzdaFw0yMTEwMjIxMDAyMzdaMIGj
- MQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94
- Zm9yZDELMAkGA1UEChMCT1UxDTALBgNVBAsTBE9VQ1MxJjAkBgNVBAMTHWV0aGlj
- cy1ncmFkaWVudC5vdWNzLm94LmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpkYXZpZC5w
- YWluZUBvdWNzLm94LmFjLnVrIDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
- ggEBANpgnm1ZdH5VrhKZt66jAFXdsWxVUVhJJUT9HmViJJkAeGIwKML3tld0/j1v
- KRXs+QjQys61FzpfETql2eFT7CZb3iUVUMTbV1VBwu0Lf25H8dEtgRY0Tt+ZV0gI
- fzNnMFpfb7EtNZZHdbU6rxKmY7xeZCvOBRWdy5kF78J7gvGnYaHV2ArgmaMRCIm9
- QA3bqRlLeRxT8owEhQgPaxHE3jZVQX9o6hTJqM3/L/uRCpdf3EJepL4ZC9AMDStK
- bfdSOcHq8WrbTx4juTedJc2QjI0CLeRzD18pzMZj8Y3mc/bUeMoh1mXnPLe6e2Kc
- zW4NN5vGCYjihHZga9v+51oOgSUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
- hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
- FCGPm3EqAWvjN9zModxeKu784rsTMB8GA1UdIwQYMBaAFCGPm3EqAWvjN9zModxe
- Ku784rsTMA0GCSqGSIb3DQEBBQUAA4IBAQAnR9s594S+zzVQzrOtYwxpr2Z103xZ
- 7rCQUmolApSAvd4dZ0srrUl5f7DQqACGKbvaYMuLwUObqxXGnJeK5/II4ZoByE0c
- D/Po9V/MCTpL/Nas2z5Suc4vFsCbKmbngOS2FmXHFQMCraKhIJCp4eCfqWY3Tj3i
- 1sttvjMWb/KMokwV6cH6gkSqDRgbLuvKsy4B/0LeAM0FkswOtQDbxuKlIsgkdsjp
- S3EDoLO9KauhnpwuvCqRYuV/NQi2FMCKl/5tiOmKW8l/BaQy2FY/VImjGYZFOpvm
- QLNfViPTeObrR0sZF2spXInDR2IWwMyZ+MCl4p07RuKQWQwqKp4mCfzG
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Test SP for Vidaas Project</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://vidaas.oucs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Dave</GivenName>
- <SurName>Paine</SurName>
- <EmailAddress>mailto:david.paine@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Dave</GivenName>
- <SurName>Paine</SurName>
- <EmailAddress>mailto:david.paine@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index e5302cab..00000000
--- a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://exam.mvm.ed.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 Medical student online assessment SP for the University of Edinburgh.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
- MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
- P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
- lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
- VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
- DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
- E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
- MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
- ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
- DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
- jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
- DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
- SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
- </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>
- MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
- MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
- P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
- lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
- VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
- DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
- E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
- MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
- ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
- DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
- jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
- DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
- SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Edinburgh: Medical student online assessment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>MVM Learning Technology Section</GivenName>
- <EmailAddress>mailto:mvmlts-elearning-support@lists.ed.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Arek</GivenName>
- <SurName>Juszczyk</SurName>
- <EmailAddress>mailto:arek.juszczyk@ed.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml
deleted file mode 100644
index ea9f2ca5..00000000
--- a/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ezproxy-dev.bodleian.ox.ac.uk/sp">
- <!--
- This is a "Test EZProxy server at the Bodleian Libraries" EZproxy SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-19T11:27:41Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol ">
- <Extensions>
- <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://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwjCCA6qgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBoTEmMCQGA1UEAxMdZXpw
- cm94eS1kZXYuYm9kbGVpYW4ub3guYWMudWsxCzAJBgNVBAYTAkdCMR0wGwYDVQQK
- ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECxMSQm9kbGVpYW4gTGlicmFy
- aWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFj
- LnVrMB4XDTE0MDMxMjA5NDYyMloXDTI0MDMxMTA5NDYyMlowgaExJjAkBgNVBAMT
- HWV6cHJveHktZGV2LmJvZGxlaWFuLm94LmFjLnVrMQswCQYDVQQGEwJHQjEdMBsG
- A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFuIExp
- YnJhcmllczEuMCwGCSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGSmVu41X8W
- Gv+lhkrjZEjSRDjISyDpxkvs+L9KScpbWjyUe83d+E7pxl/KXqCJPTUPM/iqy5G3
- MO9EdHJoVtRSadXgw+fqbPhSmefBFeLWQY+1xp+DZSBfncUOXJJIUWDFjCIGYKRu
- n6YzzB0NnTx4GrGYXRdCUhrhCLn48eIrl1BuRFU2UR8JdEgD2cR+F21x5ZTlWeJB
- zdMPTq6+YRC8lnuVmqKZ8uMuwlAAd2srkwWcoh8b3+r2tQx6/4RfT435ooV9Cd0w
- DdoGflxHT1KCe74voJ56Z87TK8IhTLCB4k4WZmk4ltZhbLCvCav1SaDasgxuXlBM
- fmiKJEwqzWUCAwEAAaOCAQEwgf4wHQYDVR0OBBYEFFZbT+1hVIbJuJz/2vy/1fpn
- Rf8pMIHOBgNVHSMEgcYwgcOAFFZbT+1hVIbJuJz/2vy/1fpnRf8poYGnpIGkMIGh
- MSYwJAYDVQQDEx1lenByb3h5LWRldi5ib2RsZWlhbi5veC5hYy51azELMAkGA1UE
- BhMCR0IxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJC
- b2RsZWlhbiBMaWJyYXJpZXMxLjAsBgkqhkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hA
- Ym9kbGVpYW4ub3guYWMudWuCAQUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
- AAOCAQEAUtn7eo+/UFIkxAP++WQut9InVxR+s2kGghtOYDPNMqVJfk+ODXnU2oKJ
- Vkh4/eSVTCi7UkTTZ7kTWpA6g0aseG14mY47w6Subl+8Cg5V0k6p7ZYI2NSRq+GU
- GSKjrfIB3Vca6QATPnDjOaWjT2JvAXyt0lZr5a339hvorzqRqOGTfUbbRiRkZ4rB
- sfaHlME0KgtNGJKWyOT3oY9xvNNQUs7TXj1407LPpxe+ip+WMjrx61KeYg4rqqMP
- gxddMQbBW4a1taVv4xKTIMdlAaKhqKDYlUUN0Wx+UaKdc3RRUdxVpQS1Ilq1SQf1
- e++9G2F76AB+7FNf2Xs4G3K3mhIm+A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Test EZProxy server at the Bodleian Libraries</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
deleted file mode 100644
index a02cf438..00000000
--- a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ezproxy.bodleian.ox.ac.uk/sp">
- <!--
- This is an EZproxy SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T13:52:15Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <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://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwjCCA6qgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBoTEmMCQGA1UEAxMdZXpw
- cm94eS1wcmQuYm9kbGVpYW4ub3guYWMudWsxCzAJBgNVBAYTAkdCMR0wGwYDVQQK
- ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECxMSQm9kbGVpYW4gTGlicmFy
- aWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFj
- LnVrMB4XDTE0MDYyMzE0NDkyMFoXDTI0MDYyMjE0NDkyMFowgaExJjAkBgNVBAMT
- HWV6cHJveHktcHJkLmJvZGxlaWFuLm94LmFjLnVrMQswCQYDVQQGEwJHQjEdMBsG
- A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFuIExp
- YnJhcmllczEuMCwGCSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMy7FpGCv0m1
- vFDU51um8KLgUHdvb86ItBRdFWZAG0L0DN771m4KKP0zvhvsTOM9r7Ed3gj+eOp0
- BpE/MmZ52ZB6qBYaC2Ele7WXIQuRR0Uzp4uENyHMrduTc/MjNQPsw9Ncfp8u6M11
- aQ1lTkVVudandM0EEUY01PiyBfIg0bMECn/alNpSONbOH95RCogN3ekJfWHQiDlK
- pYqTVi+ru87WQHeDsJeP7RHxZRJCS1Sb0qA+61RpheQ4XEDWU9Z0uqxOqO7qduDT
- yU3y5fNcTPaGPj8dW26/Jo9T7lugq88564Y26Qa3ZtNW/GZlhZ5icWxPZNzIpp6C
- HosCP69zjJkCAwEAAaOCAQEwgf4wHQYDVR0OBBYEFLB6ps4ijHla7Ge8uzD+d9JG
- hymdMIHOBgNVHSMEgcYwgcOAFLB6ps4ijHla7Ge8uzD+d9JGhymdoYGnpIGkMIGh
- MSYwJAYDVQQDEx1lenByb3h5LXByZC5ib2RsZWlhbi5veC5hYy51azELMAkGA1UE
- BhMCR0IxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJC
- b2RsZWlhbiBMaWJyYXJpZXMxLjAsBgkqhkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hA
- Ym9kbGVpYW4ub3guYWMudWuCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
- AAOCAQEAZOF4suQjW4BS/mEX5wBI1onO3jm//y6AqG+afYPYzbKdTI/v6vgSEmgt
- Z2n7Oon+IGaSThSQ6/AVXE3WtqF7ForHBXeiFbLMPVDnMb9toJ0fj18QGwXDUTEM
- V2jxmheFqbFz7lzBocD3gdSe2RiPyK6r7eVbKKhWTxSi6/26kuzkxj1ZRYLDzQ2z
- +6g14ZhRzndwXfP02gR0vJI+W4qbhFAwXLUpHYDHseOHmi0YMZqGYSI2MPW6p0mQ
- s+JAy11ZO8tyNj2GE4xM5kuvlct2QeU7ylJS/g/ZRsIShr+vQYUhb0/vWdHKCrRj
- UAF75n0odH/cwINMGEcK6L4NNU1orA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford EZproxy service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://bodleian.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
new file mode 100644
index 00000000..0866b4f5
--- /dev/null
+++ b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed.p.lodz.pl/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-08-03T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </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">p.lodz.pl</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Lodz University of Technology</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pl">Politechnika Łódzka</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Lodz University of Technology</mdui:Description>
+ <mdui:Description xml:lang="pl">Politechnika Łódzka</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>
+MIIDHzCCAgegAwIBAgIUf92tx4MSZkG0nD2gvKf1684tQsYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTJaFw0z
+NTAzMTkxMjIzNTJaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQClJEvUpbTZ2twCfK6BPayJ+NOosjc+5yQQ
+82+oQPkK9AUBj3L5nG1d8S0ytNrP023FBEPHqlKrrP1IYFr6//tZMG77pz4iJkAI
+bP3ALXmd0DkDbEk5f0lZRbgicRsNUqG/XZ+YU2vptTM+qjeRN6oC4kTfy2hyT6ZT
+l0QFQudrh8DXXnC//2PcIp2LJOVpi/s0bkx17CsFe1wXKGiE+IRjxREwMPsjhZcL
+0kRyOWvNFgZJdYA7QwbwpX2r4JO9QtPJlj0r5a+AlmqFvXRrYHoZRY/xjiFsE5da
+LhA3/T/qpJTSuOLq/OAKdg7btY3NXyUVEA96YjLM7sB+3pH5f0LvAgMBAAGjYTBf
+MB0GA1UdDgQWBBSMCHpJHpAfliH4Oas5962Zaj4F9jA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFMj2tTRqW2cjCBtUrYQvkrbS9ThyMeskXqBlv8Z
+yuK5649zIrA3A9u/DYHum9bVf+gfvcIPfMTmBdcthMVTJIz4jD0B+Q6UdYO+YLnb
+GIHo5I6+5YcaiHG3vDJ8bwQQ0c3y2BV+xXazoPUHMQAQhw657P3zVVmXQrBL81S8
+jrKFuLnw92jEyfvJvanV5hGLq6/sFIlFYMIXjVp60rkn/jYiVRy46GPZXzyuTQfN
+wnHFEgO9IZFWIfExNj8Vs2cWxZd4P6r6D7IXbeEtPz53yfi3t28vATtQKi12JHEC
+16rusRPe4GqH6oWfMN55z6Hl6dBDSFxv0xuqLKZZQOA5sa4=
+ </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>
+MIIDIDCCAgigAwIBAgIVALBJ54FSifljTYxqdKs9piNvZRmGMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwHhcNMTUwMzE5MTIyMzQ5WhcN
+MzUwMzE5MTIyMzQ5WjAYMRYwFAYDVQQDDA1mZWQucC5sb2R6LnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAht1Z4j3LNunoGUj0Xg1mVFm1pC9G2h/W
+KJx9e6hpsQNeOV164mLeDocnSPZz0sN8yMOdtPKgRp11pqjxY80Y62fbmL4Z5VzR
+S5LSPb4RwK8bDt+Y5VrpEQfahyhKn4FTv0ONx3ayQHhBkeVtwv6m5OcKbohTP4KL
+Ga//7AA1yUuSHOMsNs5Jl0+Qw+pnrqq0NdxuJNUVvpzmsy/LECw4yT1TYPtmKIT0
+BRoKFnptuAvUeuzI8X4Sk7nHPmnwkEVTCXm5KlCdRrrRAXOv75rCMnoHwlljGArW
+N8pr5Bi95j2/JTspzdD+Sd4ZJ2KL0RbLB7WJzxwdxdU2brJmzvyAHQIDAQABo2Ew
+XzAdBgNVHQ4EFgQU5pnJ2LRleP5CXaU7Q3p13pllUXQwPgYDVR0RBDcwNYINZmVk
+LnAubG9kei5wbIYkaHR0cHM6Ly9mZWQucC5sb2R6LnBsL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAqca7YchwV5OSyMoKyVAka7UJfaUiL45t4lhjx
+GQK715ftzkPITSuOnt+xrx5JHLWyw47xNIj+W+HckkhnWpeQ4QQrEAO8T63pZrUv
+H+gOYWqKOaYum0D1+CaBen29Unts9Ie9hiqFg5yUy40LG10JYZeGcYMLw4f5b+Sz
+K9z2eS9vbYBf7F2snpz/PG2XWXhh3qgQAvQfgNhlT81IjRyYZQhjFKdw+Oiklp+Z
+J25Z/5z3Qt2aL7DuQC5/9xfyPmI0K6fHnMIkpE+t9XGXLCvQgVmCzzudXLdaVIwf
+NzpyfHJJG9+8ns6iv60kTPTWKis5/IMSjcdeGmyUvDzEqs8I
+ </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>
+MIIDHzCCAgegAwIBAgIUNXScWBo43xj5lpqlUdGPP9YZL3QwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTBaFw0z
+NTAzMTkxMjIzNTBaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChdv4HP1QY4J29sh1jYKp5J0NAVAOyc1wv
+MBAtrEQYoVT3QETu5380X/ZBVwpOrxUa5andF6XcNxhK3TlTj6XqbOeEboL9yGqc
+Hhu5GRFjHfTUmPKsEsuIPT7g8yVuR/kqVq7CvNkbi1hse2ZPDf0WXDmDJeG+DdXc
+txyuRtG+mn/b5/faxneH7lNgK/Vv/ciM66ezNBtjqB94QtZNmCosuHJmzuEYbwMF
+NEFLBfNeaxdu5GPnHXZJdGRcoKzYIL3f5tEKMXV0OFnE5PekRiWl1rkPgDyLgY41
+wwz5l9J1lere/jSxRTJJxXdg9KVc9CtRyCSKh41Z7jlaAP7Oy3mdAgMBAAGjYTBf
+MB0GA1UdDgQWBBTuGHz++Xnn/VzfXKWxhyTT+h9CXTA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFi7u1NDWSQzg9qV3Jfc6kXX/JoBYw4fD0E4dUSg
+e4Dt2jDy42Psv1lBedpDN9Z/SWCl5C9X5qFRh6aGOTC1Az/j0XNuU4l9lx4DBXyO
+8Go9+znYd2l5bLkekCh2FF/EhCCHikhG0BAzc/m3n/FI+SC+pR3noUkTFChsj/YO
+v+rTqPYf+nXDtjzxOTy7iXJewLd0AaC4cK9BeOED5RyZADtK76zhv9pkUJwK1mWr
+nneqUZTQqcy82KLNUIk6u943LlhuqCXzy/idqKydkbAMxo4ZtL6mLFIBuAgU8Tm7
+4J3XCqnActMT97Zf5r6j4RjYBhiuFU30SvNV857zAr+/noQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.p.lodz.pl/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fed.p.lodz.pl/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.p.lodz.pl/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">p.lodz.pl</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUf92tx4MSZkG0nD2gvKf1684tQsYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTJaFw0z
+NTAzMTkxMjIzNTJaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQClJEvUpbTZ2twCfK6BPayJ+NOosjc+5yQQ
+82+oQPkK9AUBj3L5nG1d8S0ytNrP023FBEPHqlKrrP1IYFr6//tZMG77pz4iJkAI
+bP3ALXmd0DkDbEk5f0lZRbgicRsNUqG/XZ+YU2vptTM+qjeRN6oC4kTfy2hyT6ZT
+l0QFQudrh8DXXnC//2PcIp2LJOVpi/s0bkx17CsFe1wXKGiE+IRjxREwMPsjhZcL
+0kRyOWvNFgZJdYA7QwbwpX2r4JO9QtPJlj0r5a+AlmqFvXRrYHoZRY/xjiFsE5da
+LhA3/T/qpJTSuOLq/OAKdg7btY3NXyUVEA96YjLM7sB+3pH5f0LvAgMBAAGjYTBf
+MB0GA1UdDgQWBBSMCHpJHpAfliH4Oas5962Zaj4F9jA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFMj2tTRqW2cjCBtUrYQvkrbS9ThyMeskXqBlv8Z
+yuK5649zIrA3A9u/DYHum9bVf+gfvcIPfMTmBdcthMVTJIz4jD0B+Q6UdYO+YLnb
+GIHo5I6+5YcaiHG3vDJ8bwQQ0c3y2BV+xXazoPUHMQAQhw657P3zVVmXQrBL81S8
+jrKFuLnw92jEyfvJvanV5hGLq6/sFIlFYMIXjVp60rkn/jYiVRy46GPZXzyuTQfN
+wnHFEgO9IZFWIfExNj8Vs2cWxZd4P6r6D7IXbeEtPz53yfi3t28vATtQKi12JHEC
+16rusRPe4GqH6oWfMN55z6Hl6dBDSFxv0xuqLKZZQOA5sa4=
+ </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>
+MIIDIDCCAgigAwIBAgIVALBJ54FSifljTYxqdKs9piNvZRmGMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwHhcNMTUwMzE5MTIyMzQ5WhcN
+MzUwMzE5MTIyMzQ5WjAYMRYwFAYDVQQDDA1mZWQucC5sb2R6LnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAht1Z4j3LNunoGUj0Xg1mVFm1pC9G2h/W
+KJx9e6hpsQNeOV164mLeDocnSPZz0sN8yMOdtPKgRp11pqjxY80Y62fbmL4Z5VzR
+S5LSPb4RwK8bDt+Y5VrpEQfahyhKn4FTv0ONx3ayQHhBkeVtwv6m5OcKbohTP4KL
+Ga//7AA1yUuSHOMsNs5Jl0+Qw+pnrqq0NdxuJNUVvpzmsy/LECw4yT1TYPtmKIT0
+BRoKFnptuAvUeuzI8X4Sk7nHPmnwkEVTCXm5KlCdRrrRAXOv75rCMnoHwlljGArW
+N8pr5Bi95j2/JTspzdD+Sd4ZJ2KL0RbLB7WJzxwdxdU2brJmzvyAHQIDAQABo2Ew
+XzAdBgNVHQ4EFgQU5pnJ2LRleP5CXaU7Q3p13pllUXQwPgYDVR0RBDcwNYINZmVk
+LnAubG9kei5wbIYkaHR0cHM6Ly9mZWQucC5sb2R6LnBsL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAqca7YchwV5OSyMoKyVAka7UJfaUiL45t4lhjx
+GQK715ftzkPITSuOnt+xrx5JHLWyw47xNIj+W+HckkhnWpeQ4QQrEAO8T63pZrUv
+H+gOYWqKOaYum0D1+CaBen29Unts9Ie9hiqFg5yUy40LG10JYZeGcYMLw4f5b+Sz
+K9z2eS9vbYBf7F2snpz/PG2XWXhh3qgQAvQfgNhlT81IjRyYZQhjFKdw+Oiklp+Z
+J25Z/5z3Qt2aL7DuQC5/9xfyPmI0K6fHnMIkpE+t9XGXLCvQgVmCzzudXLdaVIwf
+NzpyfHJJG9+8ns6iv60kTPTWKis5/IMSjcdeGmyUvDzEqs8I
+ </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>
+MIIDHzCCAgegAwIBAgIUNXScWBo43xj5lpqlUdGPP9YZL3QwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTBaFw0z
+NTAzMTkxMjIzNTBaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChdv4HP1QY4J29sh1jYKp5J0NAVAOyc1wv
+MBAtrEQYoVT3QETu5380X/ZBVwpOrxUa5andF6XcNxhK3TlTj6XqbOeEboL9yGqc
+Hhu5GRFjHfTUmPKsEsuIPT7g8yVuR/kqVq7CvNkbi1hse2ZPDf0WXDmDJeG+DdXc
+txyuRtG+mn/b5/faxneH7lNgK/Vv/ciM66ezNBtjqB94QtZNmCosuHJmzuEYbwMF
+NEFLBfNeaxdu5GPnHXZJdGRcoKzYIL3f5tEKMXV0OFnE5PekRiWl1rkPgDyLgY41
+wwz5l9J1lere/jSxRTJJxXdg9KVc9CtRyCSKh41Z7jlaAP7Oy3mdAgMBAAGjYTBf
+MB0GA1UdDgQWBBTuGHz++Xnn/VzfXKWxhyTT+h9CXTA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFi7u1NDWSQzg9qV3Jfc6kXX/JoBYw4fD0E4dUSg
+e4Dt2jDy42Psv1lBedpDN9Z/SWCl5C9X5qFRh6aGOTC1Az/j0XNuU4l9lx4DBXyO
+8Go9+znYd2l5bLkekCh2FF/EhCCHikhG0BAzc/m3n/FI+SC+pR3noUkTFChsj/YO
+v+rTqPYf+nXDtjzxOTy7iXJewLd0AaC4cK9BeOED5RyZADtK76zhv9pkUJwK1mWr
+nneqUZTQqcy82KLNUIk6u943LlhuqCXzy/idqKydkbAMxo4ZtL6mLFIBuAgU8Tm7
+4J3XCqnActMT97Zf5r6j4RjYBhiuFU30SvNV857zAr+/noQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Lodz University of Technology</md:OrganizationName>
+ <md:OrganizationName xml:lang="pl">Politechnika Łódzka</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Lodz University of Technology</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pl">Politechnika Łódzka</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.p.lodz.pl</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Biura Obsługi Klientów Centrum Komputerowego</md:GivenName>
+ <md:SurName>Team</md:SurName>
+ <md:EmailAddress>mailto:bok@p.lodz.pl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml
deleted file mode 100644
index 981a2434..00000000
--- a/swamid-interfederations-2.0/federatie.driestar-educatief.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.driestar-educatief.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-24T12: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">Driestar Educatief</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Driestar Educatief</mdui:DisplayName>
- <mdui:Description xml:lang="nl">Driestar Educatief</mdui:Description>
- <mdui:Description xml:lang="en">Driestar Educatief</mdui:Description>
- <mdui:Logo height="108" width="120">https://static.surfconext.nl/media/idp/driestar.png</mdui:Logo>
- <mdui:Keywords xml:lang="nl">Driestar Educatief HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="en">Driestar Educatief 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/ebc22074669e3e895bbb22bdf6d5c6da"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Driestar Educatief</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Driestar Educatief</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.driestar-educatief.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/fedlogin.studienet.ou.nl.xml b/swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml
deleted file mode 100644
index 7aeb5d12..00000000
--- a/swamid-interfederations-2.0/fedlogin.studienet.ou.nl.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://fedlogin.studienet.ou.nl">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T15:41: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">Open Universiteit</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Open Universiteit in the Netherlands</mdui:DisplayName>
- <mdui:Description xml:lang="nl">Open Universiteit</mdui:Description>
- <mdui:Description xml:lang="en">Open Universiteit in the Netherlands</mdui:Description>
- <mdui:Logo height="48" width="24">https://static.surfconext.nl/media/idp/ou.png</mdui:Logo>
- <mdui:Keywords xml:lang="nl">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
- <mdui:Keywords xml:lang="en">Open Universiteit in the Netherlands OU Heerlen</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/83f4a7d287f0e91e7d93e2f3867dbec5"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Open Universiteit</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Open Universiteit</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ou.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/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 5a7f0708..00000000
--- a/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fieldtrial.safetynet.rmplc.co.uk/shibboleth-sp">
- <!--
- This is a Shibboleth 2.3.1 'Safetynet Field Trial' SP owned by RM Education 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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
- MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
- MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
- sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
- 0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
- ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
- byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
- AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
- DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
- Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
- aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
- 78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
- rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
- zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
- pEJ7l2rYmZM+/vn4aw==
- </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>
- MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
- MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
- MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
- sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
- 0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
- ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
- byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
- AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
- DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
- Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
- aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
- 78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
- rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
- zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
- pEJ7l2rYmZM+/vn4aw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">RM Education plc: Safetynet Field Trial</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.rm.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth Technical Contact</GivenName>
- <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Shibboleth Technical Contact</GivenName>
- <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
new file mode 100644
index 00000000..a970a4cf
--- /dev/null
+++ b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/metadata.php/discover">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RESTENA FileSender Service (TEST)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</mdui:Description>
+ <mdui:Description xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</mdui:Description>
+ <mdui:Description xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</mdui:Description>
+ <mdui:Description xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</mdui:Description>
+ <mdui:Keywords xml:lang="en">RESTENA FileSender large XXL file transfer</mdui:Keywords>
+ <mdui:Logo width="100" height="100" xml:lang="en">http://fs-test.restena.lu/filesender.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIG5TCCBM2gAwIBAgIJAIlJ6s/iVngWMA0GCSqGSIb3DQEBDQUAMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHUwIBcNMTUwNzA3MDczODM0WhgPMjA1NjA3MzEwNzM4MzRaMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFF6WZKlTiLtMKFcaxto35kXkY+E5+rwMgmfMJwiLwGLqYiZT+Wf0cmhJNm8GXKGl6dncYeuJOsR6oN26vQGNa3mAK8FVagQlvurjhncu7i0Slo0jdIz6sYRYUBtegRXjdJ0Xlnvm2v45azl/3XGteRQaSks9a1buWY+mxTcbgIWYNKCIKlgf+DKZtVs7dIKytsa2F0RaV7b56o9JmknpzDxOoucxGdMB9874gcI4F8n7465tMMxRyL0DYXksQt3nyBJYlK54C4pJcpPMq6dqRiuVucHyjZ88Q1NNphhBFPWHrlfEz0S4CBbtwNym+U0YUERh/AZmcisl6eJjFGISvhHGLMSBPQiiQVktNzZkQdCsoWOA7YO0a1Yh/ywxQXFxP4ldyA6Xe5bcTMBfQlZ7i1TJWfyyCpWtmqekr/uf6MHuDXFlWvxZNwNdtJdwaykz/Ql4sYw5tTGXd7waH0p0WWckWQwUOQcGloP1fhCo5bPaFAnJHtOgnLw2MIEd+uSsO3WcEGXvNlTLCl98hedx1tKsIE2zDFzBrJaq9JSBk/QHTGEgBC4pAD49jvK8FlRug/ljbXDCLcBitZqQhW/tyqLn6/6b2abCa91DxmacLp74OFtRi3Cvd7la6nogPSeeyOdo58KGxDkjs7woEwT7uWm5uXDl3iiRYfeJVM7VkIQIDAQABo4IBRDCCAUAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO7KeYdBzZfUWhMqrom6YSJaptSrMIHBBgNVHSMEgbkwgbaAFO7KeYdBzZfUWhMqrom6YSJaptSroYGSpIGPMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHWCCQCJSerP4lZ4FjAJBgNVHRMEAjAAMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9mcy5yZXN0ZW5hLmx1LmNybDANBgkqhkiG9w0BAQ0FAAOCAgEAWup+YqfjH+BZbuo7VVBNP+UelxnRjC9Pnev5950kYQimC67OOrkJoILpEMiSJz9D5XhmmmCYAfsxUZmHHh2INkl41o8TQbLmNNgQKh4JQ9foi+jhvyhAuE8S+1X5t0gpmb5otxQwUC7utdvXn70sY5Kke+DiFmkiIZFB0gm8xeBpELZc1zPMS1vHtbx3SbHwuYqZYCFK3IxVdgJ1n2kD1yVavJ4clhaW+ytBZ4vdSaRBytEa6nMDE5Yj2oQEqTH85VKswnEG/xt38speI2DYqHJKCA7iIK+FXBuNGAjxRLcUuBYolGjL4qhmShO89mCqCVWmornMJZxPlURhbE2CtEhupMLW8jPKCmTVr+6k0X65YgWpnqhiwYv8sPmqNt1eyIcJkif0iKdxtB6iWo8VAROD0LgChPMuwQxrzkUMDVgvYb8MQfPuhwPynM4i0XkHZVX8E4d0W1u2Xewmuu0HsKa8GFj/OyMdE7bQSvk2KkvBhqxD2DSZJ72uVRiqxjgZuEVpSwuv6ZMPxwUT9I8P7zCL8wVtqJET0Kooh6ZXe+oogbGeuh/nmFRtgPy1va2SSKVkdl5dt77fC/nf3qlBMNmCp9N6H7zCt2VsDq3THM5FiNz8vtafch+9jUN7goJCmLU5134Rt6+SfTWn/E6fsr7I7+UMu+hjkqWS7K0jqaI=</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>MIIG5TCCBM2gAwIBAgIJAIlJ6s/iVngWMA0GCSqGSIb3DQEBDQUAMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHUwIBcNMTUwNzA3MDczODM0WhgPMjA1NjA3MzEwNzM4MzRaMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFF6WZKlTiLtMKFcaxto35kXkY+E5+rwMgmfMJwiLwGLqYiZT+Wf0cmhJNm8GXKGl6dncYeuJOsR6oN26vQGNa3mAK8FVagQlvurjhncu7i0Slo0jdIz6sYRYUBtegRXjdJ0Xlnvm2v45azl/3XGteRQaSks9a1buWY+mxTcbgIWYNKCIKlgf+DKZtVs7dIKytsa2F0RaV7b56o9JmknpzDxOoucxGdMB9874gcI4F8n7465tMMxRyL0DYXksQt3nyBJYlK54C4pJcpPMq6dqRiuVucHyjZ88Q1NNphhBFPWHrlfEz0S4CBbtwNym+U0YUERh/AZmcisl6eJjFGISvhHGLMSBPQiiQVktNzZkQdCsoWOA7YO0a1Yh/ywxQXFxP4ldyA6Xe5bcTMBfQlZ7i1TJWfyyCpWtmqekr/uf6MHuDXFlWvxZNwNdtJdwaykz/Ql4sYw5tTGXd7waH0p0WWckWQwUOQcGloP1fhCo5bPaFAnJHtOgnLw2MIEd+uSsO3WcEGXvNlTLCl98hedx1tKsIE2zDFzBrJaq9JSBk/QHTGEgBC4pAD49jvK8FlRug/ljbXDCLcBitZqQhW/tyqLn6/6b2abCa91DxmacLp74OFtRi3Cvd7la6nogPSeeyOdo58KGxDkjs7woEwT7uWm5uXDl3iiRYfeJVM7VkIQIDAQABo4IBRDCCAUAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO7KeYdBzZfUWhMqrom6YSJaptSrMIHBBgNVHSMEgbkwgbaAFO7KeYdBzZfUWhMqrom6YSJaptSroYGSpIGPMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHWCCQCJSerP4lZ4FjAJBgNVHRMEAjAAMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9mcy5yZXN0ZW5hLmx1LmNybDANBgkqhkiG9w0BAQ0FAAOCAgEAWup+YqfjH+BZbuo7VVBNP+UelxnRjC9Pnev5950kYQimC67OOrkJoILpEMiSJz9D5XhmmmCYAfsxUZmHHh2INkl41o8TQbLmNNgQKh4JQ9foi+jhvyhAuE8S+1X5t0gpmb5otxQwUC7utdvXn70sY5Kke+DiFmkiIZFB0gm8xeBpELZc1zPMS1vHtbx3SbHwuYqZYCFK3IxVdgJ1n2kD1yVavJ4clhaW+ytBZ4vdSaRBytEa6nMDE5Yj2oQEqTH85VKswnEG/xt38speI2DYqHJKCA7iIK+FXBuNGAjxRLcUuBYolGjL4qhmShO89mCqCVWmornMJZxPlURhbE2CtEhupMLW8jPKCmTVr+6k0X65YgWpnqhiwYv8sPmqNt1eyIcJkif0iKdxtB6iWo8VAROD0LgChPMuwQxrzkUMDVgvYb8MQfPuhwPynM4i0XkHZVX8E4d0W1u2Xewmuu0HsKa8GFj/OyMdE7bQSvk2KkvBhqxD2DSZJ72uVRiqxjgZuEVpSwuv6ZMPxwUT9I8P7zCL8wVtqJET0Kooh6ZXe+oogbGeuh/nmFRtgPy1va2SSKVkdl5dt77fC/nf3qlBMNmCp9N6H7zCt2VsDq3THM5FiNz8vtafch+9jUN7goJCmLU5134Rt6+SfTWn/E6fsr7I7+UMu+hjkqWS7K0jqaI=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-logout.php/discover"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">RESTENA FileSender Service (TEST)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.23735.100.0" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">RESTENA Foundation asbl</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Fondation RESTENA asbl</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">RESTENA Foundation</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">Fondation RESTENA</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>RESTENA</md:GivenName>
+ <md:SurName>NOC</md:SurName>
+ <md:EmailAddress>noc@restena.lu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
deleted file mode 100644
index f635baae..00000000
--- a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs-tst.uas.ox.ac.uk/adfs/services/trust">
- <!--
- This is a "UAS Test Federation Server" ADFS SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T15:58:44Z"/>
- </Extensions>
- <SPSSODescriptor 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>
- MIIEdTCCA12gAwIBAgIQAYeNkmekB/SM25iBZ344pTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc2QtdHN0LnVh
- cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYVAWpu
- sOdCft81RDGMmpFYRtzwQKWpMdCygldUxjphjl8x7h4YOh3EnTHFV969JZO0OM2N
- Pd0OkOJpRIxQ+1NMlkEjDciIcV3hDqK6q7tUcOGN7Wxdshj1kprpABz7uwZY9voJ
- QARQJDJsAcV4smSLcD5My+7ZuOZ/jE6CEOaE5e3RUYIevfTk4PUsT4vrQ1N32Hjs
- lKlTzeaKhY2jLVQMO+mHNgufEGv/hUQFVGPYGDdXmLaJLw+K0sMbEY+IPRknlEBf
- nTgW+ZY8HbQPrUlSeb7gWOL8wJG3g3CbXKGy7wl+XoSjwVrvJN/Pc0fBX6pChgAP
- vcKXSX8rMG2bJv8CAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBRVo3xu6xD4PEcrqyYc/nZ7PnykbzAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNkLXRzdC51YXMub3gu
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBABlAGHmGLEBxaxnsE0cK3KLd2gbB8b3U
- 6eUylt0uD9i40aSgxhZaG5lP1CPco+jomeyZCtdnQJMz07NSWTet0Bzms6ZPMYOX
- L/A7PAWjGP+nsdVHkKWO/LCwa1RwpQY7Y5gD89toQUNrVTc8UuNRpWdjpkFWrzQc
- 5ReHSCcpG3XnZgJiYeD8Fbm62qLq8DFStGxNl0LadOWtm0SYHk9AcXt0D3e63cde
- KRxLQLd/2BKKh0D9ea3I2EIMU5uwzx11M6xDVTXyzwSf34Msj6YyYWx4QASETezM
- Mz48c4qnZn8LgQbdVM0km+HhYvRWTRmWYSJMfP5oUKjKwY6omSi/R+0=
- </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>
- MIIEdTCCA12gAwIBAgIQUBxe1RI1OSeeGJz+HrEzhjANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc3MtdHN0LnVh
- cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdJ3HyV
- 4zb2QhQ7+oZ4pSt1mdc4zhkKxz2Uh3re0pTG72YxfiZTuyjcbE4MQysotAAQHvrt
- ezyyC5RXOEAF5Rnvsmda4Qm4NF0FHFVSjULopBm6w363doFz79pL8Uj7OcG5w8Tw
- ESotHf8a0UQcliwpTRY+seFSuLcexOGKNHG/F0bCMXTiNcJFYLAhJ5aF5WqDttPN
- g3WwBozla6QRDZpvOPVZAVsR79wJ9ntVxy8U0zs1ErBm5AF1bpHLcQBHTOXvcreO
- LeB8r0micOvJYndfD7ZpNnhCF80L3Msy/FmxyrAd1n4B/NfluCd8dB/wutSIlQfh
- nhfN+1JcgUtIDRMCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBRf/qdLfo/Qs/aJMHLCOf/7p35aDDAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNzLXRzdC51YXMub3gu
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBAKn8mZS6VfJxeShly/I/YixiHwSnAsG8
- rtH8N0rE7wmrnYUlZ048ihBc4Pv4f4i4YAL8ilujcqSNWt5XNBCM3+FyNDVOZOlm
- 94WZ9clNsDicnG4jC/jop0lETzrN/rYoqmIIqaKPd0HnUQU89Q/9K853+VOYY/Md
- VmeNJ1CSgMW4bjC/oS4JutCCrrRisnlleRhWH5vQYIVSKOGOCaNqlHEkLSdX1irz
- WeWFbCJV+mzUy6Glo2J5TT24L8LyZuPTpBqNura5SWBcT76qY7FYfnMrx54YhlEc
- uZg2deYNiyxcEP4vZgQi764am9mYbcP3sYt1cTy8W+sTQYGKp/q0MoA=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/"/>
- <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/" index="1"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">UAS Test Federation Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support </GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support </GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml
deleted file mode 100644
index c2b1d773..00000000
--- a/swamid-interfederations-2.0/fs.rocmondriaan.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://fs.rocmondriaan.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-01T16: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">ROC Mondriaan</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">ROC Mondriaan</mdui:DisplayName>
- <mdui:Description xml:lang="nl">ROC Mondriaan</mdui:Description>
- <mdui:Description xml:lang="en">ROC Mondriaan</mdui:Description>
- <mdui:Logo height="78" width="214">https://static.surfconext.nl/media/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
- <mdui:Keywords xml:lang="nl">ROC Mondriaan International Business Hotel Management</mdui:Keywords>
- <mdui:Keywords xml:lang="en">ROC Mondriaan MBO Den Haag Zuid Holland </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/af78efe3838a68a67457881d2ffb446e"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="nl">ROC Mondriaan</md:OrganizationName>
- <md:OrganizationName xml:lang="en">ROC Mondriaan</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="nl">ROC Mondriaan</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">ROC Mondriaan</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="nl">http://www.rocmondriaan.nl/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.rocmondriaan.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/fs.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml
deleted file mode 100644
index 8c61171a..00000000
--- a/swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.uas.ox.ac.uk/adfs/services/trust">
- <!--
- This is an ADFS SP the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-05T11:05:53Z"/>
- </Extensions>
- <SPSSODescriptor 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>
- MIIEbTCCA1WgAwIBAgIQMQY/7MXlAw+1Tl71n40arTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDczMTAwMDAwMFoXDTE2MDczMDIzNTk1OVowPjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBmc2QudWFzLm94
- LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PsgyM8FIz8Q
- lHrIVQvVwOS48zVrG0x2cssguV85eR4uDsFN32+QySrDW1lkJtoSim0BeRg2e60x
- PawlF5IYUjTzAdUICwpXQWXvIqKbDggQlsMgKtVB9PXsQy40fOhrnwgsV6Af7Pi7
- 5knD5gLoKpTcp9odZdqRV33e4JrUkdm3YCPcGD6L4RYOn9ebUCO6dyG/xchkiOqE
- BSUJCy3JZy25Zz7QvOPML7LPmqlu8Qv0RF2+sF4TF/U+tEVm7mx+gTLaaW9YFvaL
- f7oRzu+W6NZ5h+DtsArIngTYjW2/1ZLUC12HPGI9+NSicKJQmYFTOJWCJEiq2akL
- QlKPmlGVXwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFH7b9Q1+6IMLbrwmwa8iUX644vSeMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
- MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
- bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
- cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
- cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBmc2QudWFzLm94LmFjLnVrMA0G
- CSqGSIb3DQEBBQUAA4IBAQBGzlxDHF1+8ihZg3lgn+z2zzkCQLaLoklE8+tyWwSe
- j43QQmk0RZlOdC6znIUt+3R4ojqZyt+UWXQEXAmLFCRjZrlAoCsFUPRe4J++0PzK
- 5wSwmACShNC33p2Akt56UGpsCoyCxRJFYBv3x3ypOpI3EvEuFiNtE3Pgx7AH3aNE
- az44a9ZQ04GILbDV5wOfnkTuyIex3nlpwEliY7tAXeo+5cs+pHmwqQQHSaLE/ozZ
- JyqA/DlMNJJjJzNCo9raeuuw3j0A+bWjeY7smiWhBFNUYyGeWwcDCAMo5uqGTOGf
- AuFy/3fEpMBaIz8MHJYjeAZJiymMUv+hOo/OtUKtuQj3
- </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>
- MIIEbjCCA1agAwIBAgIRALxjGrZNPULfZMV/GGfax6cwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA3MzEwMDAwMDBaFw0xNjA3MzAyMzU5NTlaMD4xITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQZnNzLnVhcy5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEJ/jsJh4AO
- qqIqYTWvTsob4PPzlhAWTzLtEDZxwS7foQfH2Q5adr4CEX781ZWGUafyOLADrEj7
- 1FUFZ2CLDxu/2/865ZjN/eRVlWWJkjqyxCXrVs63fCJpxj5ZLQ1m27Kx2i10/n/O
- ZoEr5Zd5732f8a9hMYU6einwUvaku3NLlkzBv4ALiXoqAB+xLBeF+tenxg0abugZ
- jnsvkjlWQoq723NVAc1nTZB6ngqAOLKl80DqU1jwVdmpdir1utWeadGRYrVcAZMW
- OJ/moFSWDtG8TAwEdCJoOx8Ka/dgwYjXkH5eumT7jBuCRplz13a3+61oK45pKqeT
- NHHUw4xOvh0CAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
- R+qQ47ntMB0GA1UdDgQWBBReU+BBsSo9x5OVvVRIYNXb4jB0yzAOBgNVHQ8BAf8E
- BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
- AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
- MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
- cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
- ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
- c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQZnNzLnVhcy5veC5hYy51azAN
- BgkqhkiG9w0BAQUFAAOCAQEAmAPn0j0WX1XekgeMqTvqQkDx9+95SjmOVW4UHmi8
- jM712t1G+tvaRztm8q9e+YK3TWj6Tjd7cdZK68TO+VggUuTKu0tfiaU0+Z0FUomy
- 7+z5Kt1+yivEqyKBtvi0ihuhLIBwZDd6FN3/0gkGoENnVntOZEy+b4vj+wI+88e9
- 3PNTPU55j1nD8JnMt0iMH04Z2R/kGG0GCkFFFT4J1zf2ViHoX3YPxTqFvvIkcUDU
- e6h1UYCvavHLlQEC+czI6vJRez2hUUjy/oAWhVJplQJgWNCo+Kbwn4gwgxJflKMy
- ixBBoodIxlw3Tiy8SOzpfplaySdFtJStux1l1daGfEQhfQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.uas.ox.ac.uk/adfs/ls/"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.uas.ox.ac.uk/adfs/ls/"/>
- <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.uas.ox.ac.uk/adfs/ls/" index="1"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, UAS Federation Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
index 208a9525..c80e4ba3 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -13,52 +13,18 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
<mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
<mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
-BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
-UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
-HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
-VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
-bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
-2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
-B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
-2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
-NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
-HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
-AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
-b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
-ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
-CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
-cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
-HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
-cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
-ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
-ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
-JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
-JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
-R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
-FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
-f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
-e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
-An5aXL3c9Q==</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>MIIHATCCBOmgAwIBAgIEC/N6MDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJG
STEhMB8GA1UEChMYVmFlc3RvcmVraXN0ZXJpa2Vza3VzIENBMRowGAYDVQQLExFQ
YWx2ZWx1dmFybWVudGVldDEqMCgGA1UEAxMhVlJLIENBIGZvciBTZXJ2aWNlIFBy
diff --git a/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 6dc6cdec..00000000
--- a/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.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://gatekeeper.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College Wifi authentication server" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-28T10:27:24Z">
- <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://gatekeeper.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAOQwjabMZUfkMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2dhdGVrZWVwZXIubmV3Lm94LmFjLnVrMB4XDTEzMTEyNzE0MDMwNVoXDTIz
- MTEyNTE0MDMwNVowIjEgMB4GA1UEAxMXZ2F0ZWtlZXBlci5uZXcub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIZzpzGZMdO8WNqgTiaHTh
- 4h7xBDoIBX2FgZMc5cvIvltA1Zbg1RCgskKcid/EGCWT+Xe9zPM7H/LablZ5KGU8
- p6tg40jzZc6ZQzPrgsPCxFDarVdn4itgm2YLhWJKMAcfhtpFc2hcD+5Cxv7QOFzg
- n/XXmQWqXedsVFftpZ2ZIbMs6LmSY8x+Eq92Him1dgiGTrxBNBKS+nqGXXt6orH8
- qkP11tQ88b9FSCuQ05vBoc0yj9wezx8BT+PYmw/2BK/fCyrLdMIYDh2RmMQnlJGI
- iLu3jrPVAi4buEVMLCPsGE20mNkDsdrCN3BCMzJ6Zi2bAX7dL6bfQT3SK+YfZk/1
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2dhdGVrZWVwZXIubmV3Lm94LmFjLnVrMB0G
- A1UdDgQWBBQVbXUza42WR0tfgqKagp9z1hPDPzANBgkqhkiG9w0BAQUFAAOCAQEA
- p9qmPeKyV8MSth4Qf82n5DH6n74JnnSQ85Mtq7rp5WK4KwJ42U3Yw768AgexjJKR
- l8WqgG2lHP3k0ZREUTFip0fEmY08RnzpMmOAdzcedeWrO1ABqNW1724hcStLQPrf
- uRLIycISwMcnPrgqK5uMxqwbp5itzomWeNRDYG6MdToJ81rOs/E5kKlGmjE7d1YS
- fvLGueVy3BbIsyJEjCz7dj5dm8+eguh3VMjRQUT4r79H+sjginc+QTBByxnSZ641
- 9ISVAGvfUB2sQMp+B3QPlrubAwMpAVKlgnmiJEYS6R8LOKZEbAOA+nBoFE9+lxmR
- xug/F2NSE54Sg/nepxJpqw==
- </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://gatekeeper.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, New College Wifi authentication server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Office</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Dore</SurName>
- <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
index 15f86e99..fc7a0f70 100644
--- a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
@@ -88,7 +88,7 @@
<Organization>
<OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
<OrganizationDisplayName xml:lang="en">Newcastle University</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Helpline</GivenName>
diff --git a/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e6d7e8e8..00000000
--- a/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gateway.wolfson.ox.ac.uk/shibboleth">
- <!--
- This is a "Wolfson College Members Portal" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-06T16:32:59Z">
- <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://gateway.wolfson.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOkS8eC5Y3zuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGdhdGV3YXkud29sZnNvbi5veC5hYy51azAeFw0xMjAyMDMxMzU0MjlaFw0y
- MjAxMzExMzU0MjlaMCMxITAfBgNVBAMTGGdhdGV3YXkud29sZnNvbi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMmt177KXs5KAESLHAE6
- msW2Jce4pFG5mmhaSrL8gFQs85FN+o6/gW3k5unIxZu+NUJ6moX4ndWNfEQiS6AN
- WLDRCnohMPPZ0+7Dxh7YdLrHUphP37aAYriv2B0caMwDicS5UAILZUlseD9SSJIH
- 3yLlMUuJ/W0qQQX6t/jOYH8QS580cCZozyoy4/4B5d8RfkPRRx1eEh0F3vip+CXv
- MiqPcjj4yLDRmpgaj5vb+6nReaw3xZNTBz/YCMQoHe2lzSAeRKKgeSQ4XFZA+jo+
- 5CrgW4SX0Ee5Bgjp9owJai8SQ+CfqQk0D73vRco3TWq5ECjX22GvpUdDueNOrZaL
- 3oMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZ2F0ZXdheS53b2xmc29uLm94LmFjLnVr
- MB0GA1UdDgQWBBSzAatpjhACRYzE8BCtxnHdVt+6PjANBgkqhkiG9w0BAQUFAAOC
- AQEAZSYFk41ZDyTd62QwjxpjSSqwICuV0RFiZwQzwRzCVhv5F8JxHjklC7SKOpKE
- 8T1lhR5OjHGV60lst5XM3eS6A7VBjmK4JY6ladf06IeKVtkby9gbHN5P69Iv9s4o
- upHabcw0/gz9clmaCxOjgKdPfVZrHcfXfwbrNU+b/QONcvHs1Xmr05sL7f6n11cU
- Ti/ntWb0fTkn3XtkhaML4EsDPZIYW9iz2ZXTI3Hh1OBbNPZQuMBT4zeEfHPCk5hU
- d2IccXOROWcZUMinWh2lVzj6id/tIyKEUzJypBdkrkCvau1FcNz7Z/NIJ4GFet6n
- 57qQTrBZCtib803Sq8yAEbi+WQ==
- </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://gateway.wolfson.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Wolfson College Members Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wolfson.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Wolfson College IT Team</GivenName>
- <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Wolfson College IT Team</GivenName>
- <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3001817d..00000000
--- a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://goto-prod.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School GOTO production" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:26:13Z"/>
- </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://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAMAONeRqTU2xMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFmdvdG8tcHJvZC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgxMDExWhcNMjIx
- MjEwMDgxMDExWjAhMR8wHQYDVQQDExZnb3RvLXByb2Quc2JzLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0OE96RgaUQaT5/T2QJyauFFB
- aK3eWXF4S9ortfE06ofcp3JIvqPzSoxQ2IHMzQpXEmy7fGIKgusCXpjUAtgbRFrP
- oK4DGCS2E8HmP1PryKj6UTpj7HBR+2kJ8JCVCslOEsLvjPQRjNDliZ2wvr8bw7+H
- NnAQ1GmObjVHp7Mm4aY7TzJ5oKI1GZTV7nyhWvQATS3qdGLYvgNm86gAi1GTKIwv
- qbon2bBRs96HYzH+BtPObBl1HJwjCXSACRHGxG4l5TBy0bde/9vp+O3rqjDrspxt
- om6j5N5xenRhZyaY9UGpGsTpU8P4MfWjeRe5UG2IfCYAvafvHfc499lhPSXwIwID
- AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXByb2Quc2JzLm94LmFjLnVrMB0GA1Ud
- DgQWBBSeowx6+U31cl0vAiB9QBPLDyzoGzANBgkqhkiG9w0BAQUFAAOCAQEAucxx
- 6svK/sfjLoJN1yvVw1fOUkeIWJQ5cxvINN2S6VrifOxYnODAGPKmMluQZSA/veco
- +2YrAbpGCftbZhUK1h2TAupy7/Kob6dpqaPfpiZTL2mWFUUShHapyZQzV6U2qtjU
- ZBkzwMpBcaqQFRDo17qrebrskP7Baw6G4Z7p5PEVxzkvsecryOKEbZ+umu0tJkIU
- X07ML5IKwkPS9TgHu5K1N9fP8H143PPO4xbc1HOLN+EjTM7v4lbebDaR0mbq4Pf1
- kUtULGLhBnRXk4+7BNARn1XTkVz5pm8paytoEuj0XaICV1XFBFRjuioehkZsDzlg
- qGeMk89a5KytkMHT/g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO production</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 12a8d750..00000000
--- a/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://goto-test.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School GOTO test" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:26:27Z"/>
- </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://goto-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAK4NFQlrOPTZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFmdvdG8tdGVzdC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgwOTUxWhcNMjIx
- MjEwMDgwOTUxWjAhMR8wHQYDVQQDExZnb3RvLXRlc3Quc2JzLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwN78tIqm1HaRSzAbBC57G0Rn
- sd3H7OjbdoNWvY+LpLsVnsCRAzhMzty4gtLeKooTBI2bVNTpQOIXaINWpvZWk2qM
- hRrykAdzLZd25li6AJAPRgy6KwS0kE3KvzaSLoC755RSChxtT82tZgX3g+eTY9//
- 4qVakTe+RfjWrx/VwHTJUSPJ36LiG6UhU7pMMYbkccxa5U3fpIRCyWdRDH2T8Rdx
- LB1JpwHW8q4pUbHQphaRevJLu4mPdf6NxvCNnTAfDylpo5WGzL901fMBdZjrC9Xh
- wyRLFzhQ0LlN1k9fohiO0NDIS5nTja/Ve8dTf7GdDLE+QQY2bZ63Qi6ip4ltBQID
- AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXRlc3Quc2JzLm94LmFjLnVrMB0GA1Ud
- DgQWBBRKKlFeaR+LtgyfVmnGIuR5P+IUOTANBgkqhkiG9w0BAQUFAAOCAQEAq2lB
- FuRq1gW83y/NJwZeWj098TSXPD+3s7PdnUTZq5PDGLubx1Xl+aWkC07x6Q+uLgmz
- WKjR8jZl9eQR4T0hKu4+pzcQ+tdG/+AUTArHSFQj0r7J2yolKDzDOYsm8jL6IODs
- yZedsc//NYUn+880r3gWA4xpIGpp66ONXSCCBcGNnnNI/q6SqmF4oiChJEMqnNyg
- 3Z81IFG5BwddG3DMmaif787Zi5cKeZWv4JjiHz6d4GF+nfNmF0Zjn77dfbnTbu0V
- BRfD+J+9Fiemupo5x2aW+XZ06Hrfd56MJbyEZkEB5c+JRfD+RxxkTQemwQsAeoQ2
- w7NRClEZf+d10tzZmg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO test</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ee456ac6..00000000
--- a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://goto.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School GOTO" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:25:58Z"/>
- </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://goto.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJAMmSuBKQmM1rMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWdvdG8uc2JzLm94LmFjLnVrMB4XDTEyMTIxMjA3NTc1NFoXDTIyMTIxMDA3
- NTc1NFowHDEaMBgGA1UEAxMRZ290by5zYnMub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDQ+u2W+HEKK/t0hZ3j6LQRIoj5YJDVw5Uz/Nrk
- GsWLQf5NgXca0FggN4/MuT5wBOt11knZcqkroo9eTd5+JXYVKq8FNFLHcBm7F/D2
- JMEofQssbW3jAfC5Ih9ns7dxWRPlQIyy747Czj5QeYgsd3VwxTCTmImet8QcczuE
- 60qUZwE57QYia1EbuQelVkFQaQFfObAlCp+z4zDbd5S4yqF+9KJIGgYgKSM5BGr0
- TUILXxGKNwSV2W34nCGq7uyVbnKlQ/oNibOvc7kJD73QyRVQF9hJsEwCqR/Ie+xq
- YlSMf7+oreYt6tBfAbsSYyMD/Yqj/3dGqAEmrqgsrummjnPZAgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWdvdG8uc2JzLm94LmFjLnVrMB0GA1UdDgQWBBS4YdkEzNKVMvr3
- 16Wgs7zbMgV5+zANBgkqhkiG9w0BAQUFAAOCAQEAYRhCCsoR4ju1QbL51GKTmwOW
- Qcc4Gx4bAu+ICEYHf65bbuY9H3LgwM7DIC+2iF9lyldaDO1VftBT2t5LFi6uoEU6
- i1X6ArIXbiMBw/zmZVKSZnClBY/X5QkeDg+tA3FnDQ45WWXlukyx3DUThr1qne1A
- sL1zu3tS/jg10A9ZTy6rgtNln6r/Zaumc7jQnRSv8zYICghX6YQHxaznQkBG4RYY
- ieWFGVN7lSw52O0YCd9DwGNg44HuTea+hE/XIkqx0LNcEGtmuJsqVGZv9yKykY0B
- iYcth/iCOH/Jh/+w1+VW3sZV3mKLQDT80uDGsCDg3LGDBpY95xQAek9MapwQ4w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c3dca188..00000000
--- a/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gotodev.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "SBS GOTO development server" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-09T14:48:02Z"/>
- </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://gotodev.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEYjCCA0qgAwIBAgIJAMxRpN+bfVZcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHTAbBgNVBAsTFFNhaWQgQnVz
- aW5lc3MgU2Nob29sMR0wGwYDVQQDExRnb3RvZGV2LnNicy5veC5hYy51azEeMBwG
- CSqGSIb3DQEJARYPaXRAc2JzLm94LmFjLnVrMB4XDTEyMTEwNjEzNDc0MloXDTIy
- MTExNDEzNDc0MlowgbExCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
- ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
- ZDEdMBsGA1UECxMUU2FpZCBCdXNpbmVzcyBTY2hvb2wxHTAbBgNVBAMTFGdvdG9k
- ZXYuc2JzLm94LmFjLnVrMR4wHAYJKoZIhvcNAQkBFg9pdEBzYnMub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUo3kXqzjNhZ47wpN836R
- JRjPTKNjkrrT99lDQCgkUQWrQCiX5q0MWU3EfkeTUv5kvtNiA/ud+bFWSk+u2Mr0
- HXjFzDLo3uHMNWGOhY8gcUpYrfT2SSDZ/G5U3mdC+lFAhZGxi8aMMTzzbPtlw/cf
- uJrJ2XuKHhGCZAk37v+aszDsMwK6T7O2EDNeLHhD/2UKdt15tsRjL351ynf0oNUZ
- QFkwBwtCc4o3DeFI44v0FbWhMVU4h+zi8ShybiyIMwE0hjijlk9o9wZPEk77SCRG
- tKZ18k0prKpsU/R/kiWGA6oUmKGpGdohOAgY5hp6bK/1XMHAFvU8NRbvhbunEIml
- AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
- ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRbIHw8+hvh5bg/mOK4XN1rQ4ZG
- TzAfBgNVHSMEGDAWgBRbIHw8+hvh5bg/mOK4XN1rQ4ZGTzANBgkqhkiG9w0BAQUF
- AAOCAQEAbfdWWFYJrdAjMzQrJX5yOtLb/EhBp1tV0UxYZtqFW639rjOs6KcqUXn2
- Fox/NxmjR1JmKu90xrZvzAH8J/pAzzViNVIpu8e/TlPOcecCQb88trfPTE2LpJaq
- kwn1+rFTwV1IibpmG9nkZ70yrLly8gAkeDcnU4THkUG6Qk9c1F+92tgxAhEPjBCy
- 9CfllJl01IvvzuZbpWjnCPNDiSntlhIda9zxiLtQyKjigEJwdaIP13bRZQ4108Xf
- +Z624SIh+fsdncCNJ0L2KckxNe6p4Ji6TtHJoLdaS3fwj5fL0uuyxGbEd4bjTbYb
- MGkV0HZLEY8UU6+u3JprQ4btOSl4ig==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SBS GOTO development server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andrew</GivenName>
- <SurName>Woods</SurName>
- <EmailAddress>mailto:andrew.woods@sbs.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andrew</GivenName>
- <SurName>Woods</SurName>
- <EmailAddress>mailto:andrew.woods@sbs.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..de708f72
--- /dev/null
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T14:30:22Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <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">garr.it</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUYTvnXW3b3991IXgqQUMkP+nhKqkwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAwwUZ3JvdXBlci5pZGVtLmdhcnIuaXQwHhcNMTUwMzMwMjIx
+MzAwWhcNMzUwMzMwMjIxMzAwWjAfMR0wGwYDVQQDDBRncm91cGVyLmlkZW0uZ2Fy
+ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7913BgHLAXXvsj
+37Sg8o8tjoXNo/C13zueCqiIJKsu2qhpwiy7KpgLADpCzLFArgT0r/aup0saMFfx
+tUa8et39E0TfPwNBLeI77TUt7QE/NHtVwDph8d0ocizAxqJC1yhUMSuwDzRU/U5H
+Y1qGJ6NrmzYqG4dKNr5CC+FUhDfdSn/UJ8o95PLV7xkqpDCcXf2WVSSmGAlR1jDP
+rdE9PcfNSvNzA71EaYTdlUXr/MadlNFf7H7rgEyZwqHrIQGjizpcWsPrZW1k0ZlB
+pgLjZFK5w0lzcS5Qt0gjdYJvdmTlyt2AZ4XurrKGMaAFNc/004DMnQYG1EYxr0kr
+LoCQV3kCAwEAAaNvMG0wHQYDVR0OBBYEFPnHU6MSgDLEwrBmW9dmMwBp/YStMEwG
+A1UdEQRFMEOCFGdyb3VwZXIuaWRlbS5nYXJyLml0hitodHRwczovL2dyb3VwZXIu
+aWRlbS5nYXJyLml0L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQB6
+X8cCYmz+iKywoiMIlXxMGRXtACODRIWh8jdUqyJwUdHqvmSPnaHSjW41By4wZcFx
+GRwURHaJfFqpG6JMFbIIlBmmdroQ02vWWalA9bhShgBhbGiHbKw4Clma9n7jDFtT
+UTEYR6Riveae/n9/PYBQrFnrMTsoV/0ig20VI70bTyY4wBkTTJgwYNon+MpMGp34
+N34CsdueAafyNMLr+BdNqmDpbLUncKxGU0z56M5r1xD/oYpWzm3asUHqPuojtFlb
+KwS+Xn3HU5Hd928ljFR+l+62LhqN8zb5SaNCJkfDkGlZU0RZEAYAWq7v5mk3A5oh
+KYJMKvnMhrAnlcxegh90
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.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">Consortium GARR</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Attribute Authority per IDEM by Consortium GARR</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Attribute Authority for IDEM by Consortium GARR</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>IDEM</md:GivenName>
+ <md:SurName>Help</md:SurName>
+ <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
new file mode 100644
index 00000000..afdff111
--- /dev/null
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T11:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IDEM Grouper SP</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">IDEM Grouper SP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Grouper SP for IDEM provided by GARR</mdui:Description>
+ <mdui:Description xml:lang="it">Grouper SP per IDEM fornito da GARR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/info.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/info.html</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/privacy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/privacy.html</mdui:PrivacyStatementURL>
+ <mdui:Logo height="120" width="180">https://grouper.idem.garr.it/grouper-sp/grouper_logo_180x120.png</mdui:Logo>
+ <mdui:Logo height="32" width="32">https://grouper.idem.garr.it/grouper-sp/grouper_logo_32x32.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDAzCCAeugAwIBAgIJAIJNTw7flL9uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGdyb3VwZXIuaWRlbS5nYXJyLml0MB4XDTE1MDMxODE0NDg0OVoXDTI1MDMx
+NTE0NDg0OVowHzEdMBsGA1UEAxMUZ3JvdXBlci5pZGVtLmdhcnIuaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzwqbkYCC3F5+SSkaqTUQwaN/dwyYH
+j1k6Z7+30/hTSSerJF33Lofmq69EaSx2R+NpeZF6FjdoAIZouwrFsgnxfo1ToJCl
+AqFfq0at395CTrk1r0RHyAIN3o3H/mN9gu2asYGfAs7cPFDmIpy2Cm3wOObtu3YV
+ccqlcf8h3DS0iNtPyqoVzShfKE54E1QQLgl+QFFbxomMD2RJCTdexNG2oeOVLoDR
+AJeX6iRThsbMjcz0W+G94YixmHeJ3E1STgT71irMEtumbS4D/ow7HdVF0RKLIKob
+dfQ8ALPV1R1C1hM5xwy4JjzlurTl28ir9AL/pv14TOWxePs6ZuKcVkipAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGdyb3VwZXIuaWRlbS5nYXJyLml0MB0GA1UdDgQWBBQ+
+1mQ9Sz4LMwDdtI2Fwcpc3NEuoTANBgkqhkiG9w0BAQUFAAOCAQEAOqe6gZCcoNW2
+8Z7hU0icrKnCx3llcCyWgX3yn1ef7zWeLy7wZGpKgOHQDbmdOaMa3vk4t0PeL7IP
+5dnmhxu15A5t+csMvTNTi5G4L3pl5vKg6Jv6V5n94UlS5sam+TtO4WPsJ8gyhIGu
+/CY+Sq/BPVs8Sy8quoTIfCtDJLYuK+rF1sHDtGlQ4dGnTWLYw4auGess8b3vxNkq
+EMA/9OGny/lSYy2Ihh97+m2w8lZPskio9dnC9BbWbiyGY5hjd1W50c6HVmR+b0fe
+ujg8dxgduViYDlu51BFyleoAxHhnauOlpFNzJuHMakCKv0riztIH3gAun7RPnFYF
+0Man4StZKw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">IDEM Grouper SP</md:ServiceName>
+ <md:ServiceName xml:lang="it">IDEM Grouper SP</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Grouper SP for IDEM provided by GARR</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="it">Grouper SP per IDEM erogato da GARR</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Grouper erogato da Consortium GARR</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Grouper provided by Consortium GARR</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>IDEM</md:GivenName>
+ <md:SurName>Help</md:SurName>
+ <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index e811c556..00000000
--- a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://havana.ucs.ed.ac.uk/shibboleth">
- <!--
- This is a Shibboleth test SP hosted by the University of Edinburgh
- for the JANET(UK) JVCS booking system.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID2DCCAsACCQDhpWXD/oCByTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
- R0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGluYnVyZ2gxJDAiBgNV
- BAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEPMA0GA1UECxMGSVMtSVRJ
- MRwwGgYDVQQDExNoYXZhbmEudWNzLmVkLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNt
- Lm1jaW50b3NoQGVkLmFjLnVrMB4XDTEzMDczMDE0MDM1N1oXDTMzMDcyNTE0MDM1
- N1owga0xCzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJ
- RWRpbmJ1cmdoMSQwIgYDVQQKExtUaGUgVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gx
- DzANBgNVBAsTBklTLUlUSTEcMBoGA1UEAxMTaGF2YW5hLnVjcy5lZC5hYy51azEi
- MCAGCSqGSIb3DQEJARYTbS5tY2ludG9zaEBlZC5hYy51azCCASIwDQYJKoZIhvcN
- AQEBBQADggEPADCCAQoCggEBAK2yC2qIxgLO+wMp4SKVyKCDpwDurMHkZkkTSidQ
- MtWLNgYwHezrL0m8iZKnCNEzT2R5i2w23aKtBkBpDqyLFWKHVGEj5O386T4AB1BL
- NJ1uqL6tNf1tkTxIBpubWWKKE8XIM/lLoN/mRJ54f/2yxiqvzvImoWA+3Uz7fIpW
- /kcfyDNnWInxPDkY65Jj7Ymd9L1bRvejIeMTkAwjMatA+astXHL/fepWEu7dvXCU
- 6Bhi95nmZTAw1dmiOCE7pfMYLM7Dn9yDNxTsk+pw0RQrEtFNoGPwxp68xJ2OmKmD
- iIdxOp9Q0hm9KnnflTTMeGKFxsp+sjksdHh2M0N/h4JMAl8CAwEAATANBgkqhkiG
- 9w0BAQUFAAOCAQEAUdniY6kaIwI0T6XxNTDUihAOwp2DAoEM/EaYRcR6DrxarzIu
- 1UbxqKRkavje+s9HO8iiFPwpLM7fnksxBAnaeNTveH7hgvJ67ELGmTd303yf7FaY
- PpB7VX5d95seuSYqedgciSA6pJRi7oalCryRSCZ0+9uqfO7DZQ8BnzjGZKvOU44q
- TjlvzyFrtqiwsl8a0vDk7a7YLpD+tsgxgzvQ++x7x4RBiMLxPfoLtN4h13SoLya5
- JwJJ+DMu7camjdGd1nyg1jv/eEUA3vuQg7CPR3jONSw5dSsNK+jHMzeogG165oAV
- IKD+m69XgWLE9gQQCzekuQChiZg5+O5EcyPAUA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Edinburgh: JANET(UK) JVCS booking system</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.jvcs.ja.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mark</GivenName>
- <SurName>McIntosh</SurName>
- <EmailAddress>mailto:M.McIntosh@ed.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mark</GivenName>
- <SurName>McIntosh</SurName>
- <EmailAddress>mailto:M.McIntosh@ed.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8716ed8f..00000000
--- a/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://health.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a "Balliol College Health Monitoring" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-19T17:10:03Z"/>
- </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://health.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAISjz39anYvxMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMDYxNDE1NDcxMVoXDTIz
- MDYxMjE1NDcxMVowIjEgMB4GA1UEAxMXaGVhbHRoLmJhbGxpb2wub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEM4MhQGL1WH/wnDLogYmE
- 22fAMVtR3DdC2JCgUbjFNDij2iEGwo+uq6sqOPxgFI8LHJd6DG0RTpn6TdPC8q6o
- q2vtpa6ncJcFIKjger8UPcOaCBf74+x2O+UF1W7BQw6MVt1dJaM05s7kk2lg+ezX
- LdMOpbzy0JLY2c6x5PEMuHqkK8slABuKBBEqxZQwrLgo4SYgxP9I2Et7OEyQHw4G
- EO5ADb7ZVpwY6JaSmcvHYbrXU9AsInhAhKa8AL4oSMFmbgvkgc3Y76+h+N3GPYOD
- y3XEEY38hWvPHSOP0cA/97PeD8G0MaGx2MfY1JizaPuFWv7l/0gGMK4qyW/wtiQR
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB0G
- A1UdDgQWBBRHj9z9ifwaUesGamTczMNhu52ttzANBgkqhkiG9w0BAQUFAAOCAQEA
- K7y6McC/jFSF5NSFePI1TYzPvgm7b5aJ5ZYyjbYvib4zqzICoEr+ehFG0lK/Q2Go
- BJa4gr7dVZLR09n15Z/OaLxpJPXfcSPCYFtMi3ZUUXbFmLjp/U2G0rB1Lciv6leY
- NCxxd7afv6NbvsRDXLCadPbRULjQepz6R0A0ewyrlw2kl1k5GB52HsjbPpXpWKTd
- xFFtqC450OBmGvKCxrBmXmKRgKSqBMCZuayejedIlTc3CsXfL3Yt89oqbINUAlHk
- jH6XT7Moapdct22P+qnwRCS/apvjf+xLuRWz7qEm/HK+dnMG1ZLEYTMAMY2tvPsr
- AKnWzztuE6aBJIRLC1YhqQ==
- </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://health.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Balliol College Health Monitoring</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ian</GivenName>
- <SurName>Plummer</SurName>
- <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ian</GivenName>
- <SurName>Plummer</SurName>
- <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 61663318..00000000
--- a/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://help.it.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:49:23Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJANte3kl4BkiUMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEGhlbHAuaXQub3guYWMudWswHhcNMTQwOTA5MDY1OTQ3WhcNMjQwOTA2MDY1
- OTQ3WjAbMRkwFwYDVQQDExBoZWxwLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEA2zwEWrEoHWjxIRuQAw521bgEWTgvziYBx2XtNzG+
- AGfK9XPrIn9KDxR9Ve0ROx5bvTMYEKi8TMWp2wUaGIYqizDfoDADSeTOaBa8XnC1
- MgshF/zYKLPbOtoXMwu8kc5p5h+ETXzw7XYG3l1+ERS8cdQ9ozNVlJEYjnYLDT2Z
- px1yHmlpul9jFpMqgT4qIzaMFv0EFo69R1REa4eLDiLrJk32Fb14X2tQWCYdMMlK
- 5jXj+RfTvIQgfwTvdur+3v87orQB952uXJ0fXTbPPgq76ri3YH0IbYMYaiZRirqX
- YJ+WNkKuD9pejZiEWpdD+l9zbrCTUDzBK2NYdCKelN/scQIDAQABoz4wPDAbBgNV
- HREEFDASghBoZWxwLml0Lm94LmFjLnVrMB0GA1UdDgQWBBTRtIlT5Ks2V33XiWgA
- U9eviW2LwTANBgkqhkiG9w0BAQUFAAOCAQEALmvigxrsTaGMK+RTB4MmI17ARfNe
- UFgG42mqlEqLaeW1SzfD3v1jkwcKAccd4V5XcgKB09fa9bVjX2PN58XvX8K/bRBw
- 0Spa+fhxS/QqjatYKGrMqSood+WRaQi/voduAv11W1utpn9qTwaaZYKdzhx/dEK5
- RJZzJiHWSDd121TIo2JsZ22GTCwt/aZjTpSHsl+PmYtXMu/wwPxD/7Lh37hNwqq4
- RE9E7Wvu6AtrcbaVeu1r574c808GWDiArwPSBD5AHVBALXvTlO+W4+YmN9Ua3Y9N
- A12BEgZWkUPf9LMkt++7lXugQ8mmODZtHFKglE1pty65rct/NFdRfErFwg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - help.it.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://help.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
index 1087451f..6eead834 100644
--- a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
@@ -33,8 +33,8 @@
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hexaa.eduid.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-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="hu">HEXAA</md:ServiceName>
<md:ServiceName xml:lang="en">HEXAA</md:ServiceName>
diff --git a/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e2391c72..00000000
--- a/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hmauth.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a 'Balliol Holywell & Jowett Walk Network' Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-06T15:22:52Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAMpMPemIjmgrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2htYXV0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMTAyMjEyNDgyNVoXDTIz
- MTAyMDEyNDgyNVowIjEgMB4GA1UEAxMXaG1hdXRoLmJhbGxpb2wub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBtZ/YetQGdunVnG/sWKrK
- cJ6dRGvUBlZQhyVeMmgqceFbWUyCZd6pTgMoXO/rkxM6+NgD1jYZ4hZ8kMnqNAei
- iko+UCEh2NK+js+mrVP6AEcYbg/gr2AlLhyKVXxNHNsGJHeVqpF0cNQY6T+pGHOI
- TbVfRAFSTB5XavhDbvjcO7iMl0P3EDMXykXmn82Eaomo8FBvF0kziKn7isiWHacv
- /VuTCIK9JhKc4p1kSGZtDf4FmwoItbXQYe2N2HnEdMqrudQuBqmY546RxFhM4eoq
- AXp2PLnPiKveVKmdQNSdz+5v9eotACDQ9I5E/DQAy+EBvnZag8AHDK+sC+15CiK9
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2htYXV0aC5iYWxsaW9sLm94LmFjLnVrMB0G
- A1UdDgQWBBQR0m+Jjz9sdV3MM2jrQtuqQxRERjANBgkqhkiG9w0BAQUFAAOCAQEA
- Xf86t46FkrRK33WlZvzSASZuE9a5e/w5eVpMjhJjVirO6TA9WbjP3H16Ru4B0WiA
- pXxEhKt8Essw0bddsuxXbBzImVkMZb6NjdEZmwtzlAM9iSTJj1S/nUDow9s3g/8M
- XeUZjMow7WEwStRerRyyL75rjjRYWDgvxqR8GleNgJOmh3I5Bro3DqP5H6XurxS5
- rkwtsUVWEIyXjrS9x1lqQW0Bbmu2yOh3pRVrmPB0Ap2VKjno4ywQSBDW+lZeCwQa
- Vf5FPYgZfoknCmWSh1gmL0HXSCP5U0x1IKDAke487auoocgT5PGCOiYMAsNplYdR
- b5EutOMJW28GnGrGr4vYhw==
- </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://hmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Holywell &amp; Jowett Walk Network</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index ebcb575c..00000000
--- a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.ilc.cnr.it/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-13T15: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">ilc.cnr.it</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CNR Institute of computational linguistics "Antonio Zampolli"</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for CNR Institute of computational linguistics "Antonio Zampolli" users</mdui:Description>
- <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.cnr.it/istituti/DatiGenerali_eng.html?cds=048</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
-MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
-aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
-Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
-8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
-aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
-3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
-lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
-KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
-dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
-n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
-woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
-VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
-5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
-KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
-4oS/xrwwW80e7RU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.ilc.cnr.it/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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">ilc.cnr.it</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
-MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
-aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
-Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
-8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
-aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
-3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
-lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
-KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
-dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
-n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
-woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
-VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
-5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
-KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
-4oS/xrwwW80e7RU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
- <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CNR Institute of computational linguistics "Antonio Zampolli"</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="it">http://www.ilc.cnr.it</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.cnr.it/istituti/DatiGenerali_eng.html?cds=048</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Alessandro</md:GivenName>
- <md:SurName>Enea</md:SurName>
- <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Riccardo</md:GivenName>
- <md:SurName>Del Gratta</md:SurName>
- <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-shibboleth.xml
deleted file mode 100644
index d66d0ba2..00000000
--- a/swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.u-strasbg.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-29T23:54:59Z">
- <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">u-strasbg.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Strasbourg - preprod</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>
- MIIDSzCCAjOgAwIBAgIULfcTXg+1f1A9POWPjeEqyjQ3YpMwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLXByZXByb2QudS1zdHJhc2JnLmZyMB4XDTEwMTIx
-MDE2MjQzN1oXDTMwMTIxMDE2MjQzN1owIzEhMB8GA1UEAxMYaWRwLXByZXByb2Qu
-dS1zdHJhc2JnLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk3R4
-f2lLgVgSq6induOx60M0LceabUqrowPsVZKz+A5Fbe9Cq5iYtcm0IU1NyZcRCFfr
-kdPmL1wFUKi8QTzUKOkcpb/ch0lQy7f/ROS0InnkEY2nyQgI8iI+pBuLMb83HQoU
-dljjTUIXIaK4vJw51EDnjrFoEuzn67+ij3wv/2mVXiw7jXp6cYxnBqN/RTH523wV
-blC47c8A/xy7i/dymS0wcCp3W9gTlsEpKqcI1Ts6bh6VRnlJJMwRKuuxlwDnWHst
-ErFMeSVTQIcQweqSkV8lIblFfuDHH4SEZ82g1HXEdU8GDqkTfuH5vBM+BpRuo7aA
-hBiWrew9/vuSAfcy/wIDAQABo3cwdTBUBgNVHREETTBLghhpZHAtcHJlcHJvZC51
-LXN0cmFzYmcuZnKGL2h0dHBzOi8vaWRwLXByZXByb2QudS1zdHJhc2JnLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDsaRU+tIpNjeoqPDvxX4tmVmLjDANBgkq
-hkiG9w0BAQUFAAOCAQEAaqBHu8f3XNFT4LDx/J8a1MOwHJUbUkfNX2kQTBdMVbL7
-dXOfJLYz5Q38RzSmfVZEz1qFwPIlngYZGOrV3ZutbR1T5vM1DoP/zkMeyDAVrzlt
-aqFQQfzaRwXBYBhSamZv8dZFsckqW6Zwbo0YDvpbjY9admBSlpHwPqLeSDBzb6CH
-BCUw7wra89o/o4LHUK4XPdhVRxI8rU4bqVa0XQ34SmeuV2IgZDyJhszh6iDyMDph
-ifnUGIAadjwrZWyJVniJuLuGPciUqWAKU4v8bx0qh2LBA4+aDhusFZiif4sUATvZ
-doL6Ha9LiNnIrmFxun4dtq9GN/WkCKTdQiojbiXNtg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.u-strasbg.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.u-strasbg.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-preprod.u-strasbg.fr/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Université de Strasbourg - preprod</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Université de Strasbourg - preprod</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Jean Benoit</md:SurName>
- <md:EmailAddress>jean@unistra.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
index 4ba71975..7cfca1d5 100644
--- a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
@@ -9,10 +9,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
- <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
+ <mdui:DisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per il Colosseo</mdui:Description>
+ <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per il Colosseo</mdui:Description>
<mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL>
<mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL>
<mdui:Logo height="16" width="16" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
@@ -96,10 +96,10 @@ D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationName>
- <md:OrganizationName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
+ <md:OrganizationName xml:lang="it">SSCOL - Soprintendenza Speciale per il colosseo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</md:OrganizationURL>
</md:Organization>
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 e627566b..b81f68ff 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
@@ -300,6 +300,9 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ludvik.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sveta-ana.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kozara.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dd-msobota.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskomenda-moste.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">padeznik-mojasola.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.amue.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
index 8398ebd5..001c29e5 100644
--- a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
@@ -82,8 +82,8 @@ JwghMs3y4HmiEKEylVhTWipavdzRw41b9jbFKmgB7MqdBiCfhQ==
<md:OrganizationURL xml:lang="en">http://www.amue.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Philippe Bader</md:SurName>
- <md:EmailAddress>philippe.bader@amue.fr</md:EmailAddress>
+ <md:SurName>German hurtado</md:SurName>
+ <md:EmailAddress>German.hurtado@amue.fr</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:SurName>Didier Denjean</md:SurName>
diff --git a/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..68393d8d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.asu.cas.cz/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-23T10:20: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:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Astronomical Institute of the Czech Academy of Sciences</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Astronomický ústav Akademie věd České Republiky</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for employees of Astronomical Institute of the Czech Academy of Sciences.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Astronomického ústavu Akademie věd České Republiky.</mdui:Description>
+ <mdui:Logo height="40" width="99">https://idp.asu.cas.cz/logo-asu_99_40.png</mdui:Logo>
+ <mdui:Logo height="76" width="187">https://idp.asu.cas.cz/logo-asu_187_76.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVANrv5WGUsquQhfjq0eTxVi20NsReMA0GCSqGSIb3DQEB
+CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMloX
+DTM1MDcyMzA5MDgzMlowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtgoG22mEK+lNwgVWg+1wUkii+TLrW
+g5CO0r/WOODmehK4kkyM/jfKeyNHp3na2KgSIVcJprguPYZ9Yhg1UU5h4TgNCEeB
+qZcJwbNNSC0lLKHvbStR7FrMiSgtnQEcghM67DvGfN88xgdUzS2DNW3Z+dCPi/AI
+GcVlzcaITsp9Ho1SUBu5uPKeCLtZ+BbuSKfekw9+vhtIdm4cK6456wNnXWGjXM2J
+wI/wShdKY5oYG5bUO9Mj2Dxq+aV6EQLMkRLSZ9LE04sYalOKIyt+LDEzmyqwVmz1
+SXb5HkA46RoWZgdIex+YIF9NasCsXwv9dyM5mvvpuqUpmhW+9LN22G9lAgMBAAGj
+YzBhMB0GA1UdDgQWBBT3XNIHand3OlDfGi4BptalsTc9WDBABgNVHREEOTA3gg5p
+ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAnZHWNtaZVfZEqU6af5xuULlBNUlGIh4O
+uMZeSbDu9pnVV0VDoIQxO+JUYXkdQduzLR564oyK/zhWKZg06f4YrsXWtkeXT3KN
+mFpVLGCOvbaD27h0hqv2CiioBcG2gAQ/t5rtU3iQCgaSqU8FP476zBh8dBVCB/xv
+jdMW+fZSfndHznmHrVjnhwMqaPgNOM45vkuwZeT0WZuhAhNXcCw3AGGrB8W4nmNd
+dsQVYrfF/KF/LG3HI3nCPWbe7vSKzdRidotQof3ZpVx/+mhM2xQu5PPAJKvT5TyO
+k7HbFDf0m9+/4WILNVLYF8L10+Gg2NSrdovl9NkyiEYi8udx9G9zvw==
+ </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>
+MIIDJDCCAgygAwIBAgIVAJdNb/Rhko4nwYw+ygi1hua8ErgsMA0GCSqGSIb3DQEB
+CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMVoX
+DTM1MDcyMzA5MDgzMVowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9FHZ+PdNss6t/V4/KurzMsMHp1Zoq
+l07jPffg5B8B1NqlLacljuvRFS8B+sGZeQQWa9HtDzxBSrlemoc9EdmC3N5QQ5+F
+1giiFJosgEd0in3h5NilYEfmovc+SLoPoLfQj21kAGLP0bMMW3wa8rl3oGTtPmJ8
+9jAc1FX6u6p3g61jeREidhMylO6GtbREhL6hXKqiyglR0zWjZCYfQCzF392lyyeQ
+nMJqI4oKREGSN27MX1YIhplnkV3amGcH/sqMjdStcYFqJc5+h/6X9iFWHFohqLpF
+rIYeVePQhbj1VDPIPUqyVBeGlsk+xpzKnSnbDsaYh/MhFJXnmn6rEbTvAgMBAAGj
+YzBhMB0GA1UdDgQWBBRWbgeUKb4C9ZnYCV4qpFnILVSyHjBABgNVHREEOTA3gg5p
+ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJd0Z2rahGuNgnK/+H3ohx7fLvpGeW2ne
+BhSVrBFTr5zVHOrfkrZvdnpV0CI65T00lYRWpIkqAN8aEJujjJXsE0kEagFM/ap8
+mQB9CZwbEKXCU7vGyoRcegrZZl3srZ62YwxfLRJjAK3DSgKM0BtMSff1rJE2K8+L
+VQqEbFfPqunsbacUA1zF4HZ3ceJQNKzIFYuFTpp+1i5RZN/+28zwNQj1XlCJ8+fN
+5KC/z5C4Kfg6PKnx5A0EJAr6Dk8afdoj6UO92/t+GF7Devsohpe2excLJ3zVJKWN
+0mIfCxb1hPlXsnaFfv/ekGZcz+JHqpHyEAXEUwLhqy97bRlPjKMFSQ==
+ </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>
+MIIDIzCCAgugAwIBAgIUHD3PnOGmtImskndM+6f3qKBHwkUwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owHhcNMTUwNzIzMDkwODMyWhcN
+MzUwNzIzMDkwODMyWjAZMRcwFQYDVQQDDA5pZHAuYXN1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALa+vR6ycaZQ3w7ropKE1MxxemCC4QIn
+jz5+Ch5gLNDyj4eIYQgvgGcS+cFzmht2oBiP4eeNyX2bNwcSerH0lANCpyBUNQOr
+jQMf0KwNgiUkkYy8Ii4CRGhcq6yhFxT6W/dx7NCx0tg44rFOLmpPXSBvZ0AepzmN
+hoaGihixtQxMSZ6VCA5oZP9E/nMgwv/PBgVHZ03Ip0djdcv2dSQyeXcCAXqcOdDf
+AQkH3aTwcLIWEJa2WdvoUTAzqgE0sKUbvDqIngP3zimFS2t2XSln1/2ThH67RQpJ
+75cBdHlUU6w+a1dkBRg+0KORyt+QoqQgQx4vYmySDU2I/l1x5zQ7ma0CAwEAAaNj
+MGEwHQYDVR0OBBYEFGSRwgu2RzBPeQQ5AMgT+VMpnyHWMEAGA1UdEQQ5MDeCDmlk
+cC5hc3UuY2FzLmN6hiVodHRwczovL2lkcC5hc3UuY2FzLmN6L2lkcC9zaGliYm9s
+ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCva6u3xg7RFn+3lcwKfCSDU3o9WyLdPfuM
+VHydFjfIxxjlBOE4sMPAbFwTvlRi+TlZXgmJDBwv1UReC68Sik+3PjAYiLwclGP/
+y0pSMmN1A1dFK/v1PrIeaZ/YZvnuh/k7IpVKX81Kg+qhkeh9eAxiLZi6Bdd3jB6r
+4mdt/d/pPHbgkVj/qZCgBBYM0S3K/KyJcEU0ku0z447/TeGOUqDQoE7l5BNBLFi9
+RLH/RkYhMb3hf89qLrOFgXCR3hAyX4xQAnyTZyxliYteSiGMfmLW6Mmr+MNaojx5
+CuBQbcFvp2S6zogNWjt2678eGQSvtIIqAVNLzE9FpmksXm5Gyimt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.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.asu.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.asu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.asu.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVANrv5WGUsquQhfjq0eTxVi20NsReMA0GCSqGSIb3DQEB
+CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMloX
+DTM1MDcyMzA5MDgzMlowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtgoG22mEK+lNwgVWg+1wUkii+TLrW
+g5CO0r/WOODmehK4kkyM/jfKeyNHp3na2KgSIVcJprguPYZ9Yhg1UU5h4TgNCEeB
+qZcJwbNNSC0lLKHvbStR7FrMiSgtnQEcghM67DvGfN88xgdUzS2DNW3Z+dCPi/AI
+GcVlzcaITsp9Ho1SUBu5uPKeCLtZ+BbuSKfekw9+vhtIdm4cK6456wNnXWGjXM2J
+wI/wShdKY5oYG5bUO9Mj2Dxq+aV6EQLMkRLSZ9LE04sYalOKIyt+LDEzmyqwVmz1
+SXb5HkA46RoWZgdIex+YIF9NasCsXwv9dyM5mvvpuqUpmhW+9LN22G9lAgMBAAGj
+YzBhMB0GA1UdDgQWBBT3XNIHand3OlDfGi4BptalsTc9WDBABgNVHREEOTA3gg5p
+ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAnZHWNtaZVfZEqU6af5xuULlBNUlGIh4O
+uMZeSbDu9pnVV0VDoIQxO+JUYXkdQduzLR564oyK/zhWKZg06f4YrsXWtkeXT3KN
+mFpVLGCOvbaD27h0hqv2CiioBcG2gAQ/t5rtU3iQCgaSqU8FP476zBh8dBVCB/xv
+jdMW+fZSfndHznmHrVjnhwMqaPgNOM45vkuwZeT0WZuhAhNXcCw3AGGrB8W4nmNd
+dsQVYrfF/KF/LG3HI3nCPWbe7vSKzdRidotQof3ZpVx/+mhM2xQu5PPAJKvT5TyO
+k7HbFDf0m9+/4WILNVLYF8L10+Gg2NSrdovl9NkyiEYi8udx9G9zvw==
+ </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>
+MIIDJDCCAgygAwIBAgIVAJdNb/Rhko4nwYw+ygi1hua8ErgsMA0GCSqGSIb3DQEB
+CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMVoX
+DTM1MDcyMzA5MDgzMVowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9FHZ+PdNss6t/V4/KurzMsMHp1Zoq
+l07jPffg5B8B1NqlLacljuvRFS8B+sGZeQQWa9HtDzxBSrlemoc9EdmC3N5QQ5+F
+1giiFJosgEd0in3h5NilYEfmovc+SLoPoLfQj21kAGLP0bMMW3wa8rl3oGTtPmJ8
+9jAc1FX6u6p3g61jeREidhMylO6GtbREhL6hXKqiyglR0zWjZCYfQCzF392lyyeQ
+nMJqI4oKREGSN27MX1YIhplnkV3amGcH/sqMjdStcYFqJc5+h/6X9iFWHFohqLpF
+rIYeVePQhbj1VDPIPUqyVBeGlsk+xpzKnSnbDsaYh/MhFJXnmn6rEbTvAgMBAAGj
+YzBhMB0GA1UdDgQWBBRWbgeUKb4C9ZnYCV4qpFnILVSyHjBABgNVHREEOTA3gg5p
+ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJd0Z2rahGuNgnK/+H3ohx7fLvpGeW2ne
+BhSVrBFTr5zVHOrfkrZvdnpV0CI65T00lYRWpIkqAN8aEJujjJXsE0kEagFM/ap8
+mQB9CZwbEKXCU7vGyoRcegrZZl3srZ62YwxfLRJjAK3DSgKM0BtMSff1rJE2K8+L
+VQqEbFfPqunsbacUA1zF4HZ3ceJQNKzIFYuFTpp+1i5RZN/+28zwNQj1XlCJ8+fN
+5KC/z5C4Kfg6PKnx5A0EJAr6Dk8afdoj6UO92/t+GF7Devsohpe2excLJ3zVJKWN
+0mIfCxb1hPlXsnaFfv/ekGZcz+JHqpHyEAXEUwLhqy97bRlPjKMFSQ==
+ </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>
+MIIDIzCCAgugAwIBAgIUHD3PnOGmtImskndM+6f3qKBHwkUwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owHhcNMTUwNzIzMDkwODMyWhcN
+MzUwNzIzMDkwODMyWjAZMRcwFQYDVQQDDA5pZHAuYXN1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALa+vR6ycaZQ3w7ropKE1MxxemCC4QIn
+jz5+Ch5gLNDyj4eIYQgvgGcS+cFzmht2oBiP4eeNyX2bNwcSerH0lANCpyBUNQOr
+jQMf0KwNgiUkkYy8Ii4CRGhcq6yhFxT6W/dx7NCx0tg44rFOLmpPXSBvZ0AepzmN
+hoaGihixtQxMSZ6VCA5oZP9E/nMgwv/PBgVHZ03Ip0djdcv2dSQyeXcCAXqcOdDf
+AQkH3aTwcLIWEJa2WdvoUTAzqgE0sKUbvDqIngP3zimFS2t2XSln1/2ThH67RQpJ
+75cBdHlUU6w+a1dkBRg+0KORyt+QoqQgQx4vYmySDU2I/l1x5zQ7ma0CAwEAAaNj
+MGEwHQYDVR0OBBYEFGSRwgu2RzBPeQQ5AMgT+VMpnyHWMEAGA1UdEQQ5MDeCDmlk
+cC5hc3UuY2FzLmN6hiVodHRwczovL2lkcC5hc3UuY2FzLmN6L2lkcC9zaGliYm9s
+ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCva6u3xg7RFn+3lcwKfCSDU3o9WyLdPfuM
+VHydFjfIxxjlBOE4sMPAbFwTvlRi+TlZXgmJDBwv1UReC68Sik+3PjAYiLwclGP/
+y0pSMmN1A1dFK/v1PrIeaZ/YZvnuh/k7IpVKX81Kg+qhkeh9eAxiLZi6Bdd3jB6r
+4mdt/d/pPHbgkVj/qZCgBBYM0S3K/KyJcEU0ku0z447/TeGOUqDQoE7l5BNBLFi9
+RLH/RkYhMb3hf89qLrOFgXCR3hAyX4xQAnyTZyxliYteSiGMfmLW6Mmr+MNaojx5
+CuBQbcFvp2S6zogNWjt2678eGQSvtIIqAVNLzE9FpmksXm5Gyimt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Astronomical Institute of the CAS</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Astronomický ústav AVČR, v.v.i.</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Astronomical institute of the Czech Academy of Sciences</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Astronomický ústav Akademie věd České republiky</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.asu.cas.cz/en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.asu.cas.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Ryšavý</md:SurName>
+ <md:EmailAddress>petr.rysavy@asu.cas.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml
deleted file mode 100644
index be21d2d6..00000000
--- a/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.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://idp.carnegiecollege.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP for Fife College.
- -->
- <Extensions>
- <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">carnegiecollege.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIVAOUN5zR4W0Yp623P7ivOXWG1NWWNMA0GCSqGSIb3DQEB
- BQUAMCQxIjAgBgNVBAMTGWlkcC5jYXJuZWdpZWNvbGxlZ2UuYWMudWswHhcNMTEw
- ODAxMTE1MTA0WhcNMzEwODAxMTE1MTA0WjAkMSIwIAYDVQQDExlpZHAuY2FybmVn
- aWVjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- jiGLbGd7T4/psE8UmyiVNE1j/T4sNaEwOdLvp0stPmfu8I+heqJ/TgblcJs0d3Vg
- 2I0SQoXqecXxZMYEXvHL80lHKZUKgCF5U7hEbCdc2Q6mtGhxbcmxonbGxXEEnzci
- v2HMvXND/uKlS/walNdpWxUZTruElufziDsJJ2bvbOFbK29JQmpbtovryCP68+TC
- qUHeyhy9vekri0tHeB/R1lIZHuUUVkhlhHD9njlNxaireJDmOouef7aYmKpX+CA7
- HD/pWazQnBLTJi1cLSbez12QDwDjKhIEh17+ne945Ibo9laDBmxhkHQ8CHsk09T5
- Bh+mImcqg2fREh8c+ELjLQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuY2FybmVn
- aWVjb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5jYXJuZWdpZWNvbGxlZ2UuYWMu
- dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMz/6hexyF79UfvamqhIzF41IeCX
- MA0GCSqGSIb3DQEBBQUAA4IBAQBPsSxzTWj/1zTaokQqCzcw3ULAb77rgV3ldUN/
- BdFGDIOn96JBAH5th8IBduafAFr9C8tfzmAV9uYLPoIeVWaZy+vjI2jIMr6Ciurt
- uV96WaUEfdqHXzST6zGQl3Zg1XLZIyNJFDTPjurufLNCEGdC1/9qFtYfNL/MVXsK
- qawDw3GsR+96Nl1QTYpYeRllUABAbxTZO/jm7gOLx+II4b7/3y5cpnKKlLmO7ALx
- 6HponMBdA1XIp7jA/UAjqgj1uxj0VWwIB3th1ZHHC5iGSZoZsT2F/61MWws0DoTz
- UcbdW5gmbo27wUFi3yN1cTFz2SMowbSx4fOzJcu/ulqb2Cz+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.carnegiecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.carnegiecollege.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">carnegiecollege.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIVAOUN5zR4W0Yp623P7ivOXWG1NWWNMA0GCSqGSIb3DQEB
- BQUAMCQxIjAgBgNVBAMTGWlkcC5jYXJuZWdpZWNvbGxlZ2UuYWMudWswHhcNMTEw
- ODAxMTE1MTA0WhcNMzEwODAxMTE1MTA0WjAkMSIwIAYDVQQDExlpZHAuY2FybmVn
- aWVjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- jiGLbGd7T4/psE8UmyiVNE1j/T4sNaEwOdLvp0stPmfu8I+heqJ/TgblcJs0d3Vg
- 2I0SQoXqecXxZMYEXvHL80lHKZUKgCF5U7hEbCdc2Q6mtGhxbcmxonbGxXEEnzci
- v2HMvXND/uKlS/walNdpWxUZTruElufziDsJJ2bvbOFbK29JQmpbtovryCP68+TC
- qUHeyhy9vekri0tHeB/R1lIZHuUUVkhlhHD9njlNxaireJDmOouef7aYmKpX+CA7
- HD/pWazQnBLTJi1cLSbez12QDwDjKhIEh17+ne945Ibo9laDBmxhkHQ8CHsk09T5
- Bh+mImcqg2fREh8c+ELjLQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuY2FybmVn
- aWVjb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5jYXJuZWdpZWNvbGxlZ2UuYWMu
- dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMz/6hexyF79UfvamqhIzF41IeCX
- MA0GCSqGSIb3DQEBBQUAA4IBAQBPsSxzTWj/1zTaokQqCzcw3ULAb77rgV3ldUN/
- BdFGDIOn96JBAH5th8IBduafAFr9C8tfzmAV9uYLPoIeVWaZy+vjI2jIMr6Ciurt
- uV96WaUEfdqHXzST6zGQl3Zg1XLZIyNJFDTPjurufLNCEGdC1/9qFtYfNL/MVXsK
- qawDw3GsR+96Nl1QTYpYeRllUABAbxTZO/jm7gOLx+II4b7/3y5cpnKKlLmO7ALx
- 6HponMBdA1XIp7jA/UAjqgj1uxj0VWwIB3th1ZHHC5iGSZoZsT2F/61MWws0DoTz
- UcbdW5gmbo27wUFi3yN1cTFz2SMowbSx4fOzJcu/ulqb2Cz+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.carnegiecollege.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">Fife College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Carnegie College</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://carnegiecollege.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Sarah Louise</GivenName>
- <SurName>MacAdie</SurName>
- <EmailAddress>mailto:sarahlouisemacadie@fife.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Paul</GivenName>
- <SurName>Campbell</SurName>
- <EmailAddress>mailto:paulcampbell@fife.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cit.ie-idp.xml b/swamid-interfederations-2.0/idp.cit.ie-idp.xml
index 1d5cf2c6..dc2757c4 100644
--- a/swamid-interfederations-2.0/idp.cit.ie-idp.xml
+++ b/swamid-interfederations-2.0/idp.cit.ie-idp.xml
@@ -3,7 +3,7 @@
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T00:00:00Z"/>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cit.ie</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c493fb33..00000000
--- a/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.coleg-powys.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for Neath Port Talbot College.
- -->
- <Extensions>
- <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">coleg-powys.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</mdui:DisplayName>
- <mdui:Logo height="122" width="100">https://idp.coleg-powys.ac.uk/idp/images/coleg-powys-logo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML
- Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH
- EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT
- FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx
- NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0
- ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw
- CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2
- TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp
- y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD
- h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL
- ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/
- g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB
- MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H
- 1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs
- qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF
- 2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh
- t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth
- gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coleg-powys.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleg-powys.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">coleg-powys.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML
- Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH
- EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT
- FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx
- NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0
- ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw
- CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2
- TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp
- y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD
- h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL
- ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/
- g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB
- MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H
- 1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs
- qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF
- 2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh
- t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth
- gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.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">Neath Port Talbot College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.coleg-powys.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Support</GivenName>
- <EmailAddress>mailto:support@nptcgroup.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Lewis</SurName>
- <EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
index 8b7384c9..44463383 100644
--- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -15,14 +15,14 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
- <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+ <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
<mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
- <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
+ <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
<mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
<mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
<mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
diff --git a/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
deleted file mode 100644
index b011619f..00000000
--- a/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cyceron.fr:8443/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-08T12:08:38Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Cyceron</mdui:DisplayName>
- <mdui:Description xml:lang="en">Cyceron</mdui:Description>
- <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Cyceron</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
-MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
-QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
-NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
-P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
-ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
-2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
-b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
-JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
-i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
-cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
-w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
-6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
-stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cyceron.fr:8443/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">cyceron.fr</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
-MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
-QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
-NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
-P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
-ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
-2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
-b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
-JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
-i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
-cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
-w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
-6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
-stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cyceron.fr: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">Cyceron</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Antoine Nourry</md:SurName>
- <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
new file mode 100644
index 00000000..3011994a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn-cert.de/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:12Z">
+ <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-cert.de</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">DFN-CERT Services GmbH</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">DFN-CERT Services GmbH</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
+ <mdui:Description xml:lang="en">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.dfn-cert.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.dfn-cert.de</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
+REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
+Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
+bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
+Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
+lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
+ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
+JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
+61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
+HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
+Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
+BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
+VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
+bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
+geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
+ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
+Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
+CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
+BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
+D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
+dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
+TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
+piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
+PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
+REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
+Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
+bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
+Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
+lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
+ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
+JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
+61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
+HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
+Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
+BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
+VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
+bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
+geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
+ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
+Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
+CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
+BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
+D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
+dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
+TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
+piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
+PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/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">dfn-cert.de</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
+REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
+Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
+bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
+Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
+lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
+ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
+JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
+61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
+HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
+Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
+BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
+VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
+bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
+geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
+ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
+Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
+CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
+BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
+D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
+dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
+TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
+piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
+PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
+REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
+Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
+MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
+bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
+Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
+lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
+ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
+JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
+61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
+HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
+Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
+BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
+VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
+bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
+geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
+ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
+Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
+CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
+Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
+BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
+D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
+dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
+TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
+piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
+PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e16</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e16</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">DFN-CERT Services GmbH</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.dfn-cert.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.dfn-cert.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Reimer</md:GivenName>
+ <md:SurName>Karlsen-Masur</md:SurName>
+ <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Reimer</md:GivenName>
+ <md:SurName>Karlsen-Masur</md:SurName>
+ <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 1e31e3e1..e056a71d 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -51,6 +51,8 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bygland.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bykle.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmi.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
@@ -59,6 +61,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dovreskulane.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">e-h.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
@@ -205,6 +208,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inderoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iveland.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kafjord.kommune.no</shibmd:Scope>
@@ -278,7 +282,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nissedal.kommune.no</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nith.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
@@ -419,8 +422,10 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valle.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vennesla.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">verran.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
@@ -431,6 +436,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vindafjord.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vinje.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westerdals.no</shibmd:Scope>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
index e598e140..521c3262 100644
--- a/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
@@ -4,11 +4,6 @@
This is a Shibboleth IdP for Heart of Worcestershire College.
-->
<Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-16T10:12:31Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
index cc035811..ce484b4b 100644
--- a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hslu.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.hslu.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-30T12:51:01Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-08-06T12:49: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">
@@ -94,8 +94,8 @@ IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
@@ -133,8 +133,8 @@ IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
new file mode 100644
index 00000000..f7367e78
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ist.ac.at/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-07-09T08:48:57Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn: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">ist.ac.at</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">IST Austria</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">IST Austria</mdui:DisplayName>
+ <mdui:Description xml:lang="en">SSO at the Institute of Science and Technology Austria</mdui:Description>
+ <mdui:Logo height="101" width="220">https://idp.ist.ac.at/images/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAKNzZl6QxKuXj/y1k1CBCEO3WHNBMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQ0WhcN
+MzUwNjMwMTAzNTQ0WjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmrQyKAjpM8u8AIxqUkiWFMlkUNiPdlVl
+YcZfFr/2C5iCKC+vRMsgcYBCiZodc9mw0BovZbf4A4T6c3oYgqTIzuSASArR9imL
+u3xYHXUa7bsjge2AZ1SXfQwkaCWyIyMcqqvD0EV4KbZkzNjZ3nzqLX9fAeQ+s51h
+XRO1G50Qq1s4RvJMjZK6j1mn6xdZHx24+D0G3GC4f6Ob6KOslLDWc97uQGmaNBs2
+LLt79q57AKao81QVhP8q94RBQ5OL8ACP+3xYPa71zaDGcixiHUoco527Gr9y+UQp
+8mSM1pQ/16PtAZsDNipwlNgJYt4mcOYi9zkiu0m64zJTeTSi7d46MQIDAQABo2Ew
+XzAdBgNVHQ4EFgQUSLkMFfObfFFP5jchC3yED/7pJmgwPgYDVR0RBDcwNYINaWRw
+LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAIIjhAwz/xp8LkOtIofUj5qLa3Axta3vcUuviZ
+cYLtEfhCb2dvtj3qwlHz6AeIjBRtuKlptX4Bexg9uA0QYSz+xPXiu43O3qqns/Nb
+5HXFKsCDpRtIZdfYhSJwh5TftsjsYn5zuE34fjPkozjfuHZIIxuVlQW1lELpql1u
+LI5BtXvOmtCt9MxwZ6lwywPSsTeBNKsFuS0Dp4lUBRoSgWu90CiKHkoGLUOUPrlN
+J1TxfFmf6lEHmb7zvSgo8Uchp/uYF7AZ7n8h8Sc+BIXaMAsLlUeFsYJLu18y90Xl
+ojDt/GTfp8exfqbFUriqj6Xhf5eu9fSY/jsodmVaOw2GoZmN</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>
+MIIDIDCCAgigAwIBAgIVAJUtQynzhfho/ZFcuyGKElEn3i4KMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQzWhcN
+MzUwNjMwMTAzNTQzWjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7vDO+qkovMUtazg1uUhu1DJ8OqCnR/n
+xdl24Vdh8gpQJsTrmg3mbpkKXzQcrmbyMVwc0XRk7wq/Fh0QQ2V2OCMkNJ9FSN/j
+VstBWjFeLCL89lYSiW1IFhYC8czmhMY67hOO9NnZB3j3T4wZVPHoALF3n+rTcCGb
+yKjbTZw32oyMZoAUkmFaQPJFvbpAziKj9w/BU+8NVCsO/PXIyVprifIXKcMYtnUr
+Tj4d6U9nurnUPXBrSuvgTsY7+zJ5jpkGGUzTSZHrPHw1FnxJSNRFxSWBIpXH5rZZ
+z6k4I6QRrgrVIcbJbvPyGKOFqGa9ZUdZZZQr3TfEsnl0D8M1SqTk6wIDAQABo2Ew
+XzAdBgNVHQ4EFgQUxeXktWyuUPNEbJZWDV4UPOsTWMMwPgYDVR0RBDcwNYINaWRw
+LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAXFWeu5vQU22HKaW3vXS4f/OcnOnlQQa1GbrJg
+D7JnoKP2j+RGecYxDQAS5+o5LbBb7wh25hHCM/OuOImbGugN253OR7kCknuMc50+
+ihXXSPFWjL0Gd68pKk3wXJJnIavwB/Evi80hVxL4dDBT498ZiwTE2vTRF1FHlj3O
+b8x/yObUbZVe9wHEr1SxOtMTOSJIb1ns0Br6H+Wji/o6LjSavZYAnxydgnhxcixn
+p9lET5YFTpHa31MRrKpb4XM+sYfrQ0khIhMyLm6BzIkuFaNpxpm/x+bOQEJwoeIW
+dulXVfj+LyVXzjp8pM9wRPfaAFbzZzCLj174b6/CfHWXl7IP</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>
+MIIDHzCCAgegAwIBAgIUeq9cJechTNP7ey2ymp1zDhsMOiswDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNaWRwLmlzdC5hYy5hdDAeFw0xNTA2MzAxMDM1NDRaFw0z
+NTA2MzAxMDM1NDRaMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgocYifpqC91GEQ1TKcyH2RuAK+eX/iStm
+Fzem7rAU/MWscL5ZEnMVwzkG1PPK1VV5EAf1WwWdfK5nxj9YCnXuq3rdtIB5+fJK
+eb8Mli+Xv8xa542cdMF5EkXaf/1iFpd+agXTd9DzjwRF4ONa5uZqEwoTY02fE1dq
+XYV4lkBC8ATfoCE6u5sUHYYJFFI8aAI61POm7CatYrVXYINMy8fubhOW/yhjdJ+S
+4/LN9d0WXrFhJu1+Cw/FYluoYXuhbwpKB2cJLnVlJjWh36TI6D6BaOPxOvgfSPGQ
+IAusp6jusBZzP4ujpmUP7HxcZemq4N0RPINrq6OERG6t/ICVmH3zAgMBAAGjYTBf
+MB0GA1UdDgQWBBSYxs9vRSPODbzitnbft+HnthjuPjA+BgNVHREENzA1gg1pZHAu
+aXN0LmFjLmF0hiRodHRwczovL2lkcC5pc3QuYWMuYXQvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAA1+R1p90OWn1Fizf8UW+vlrdPYf68yFb8snFMxC
+ssFbT6K7YzQRrBmzVeSbDqth85hjibxiPnqivbTK9YBfpX4Q8dd/MxfU9vxHvJoB
+/frFb/nP0OakEcmFma1wln0eIzMofpcKlCJaM38tDGS9bnw6XP19hLAutIzTNH0N
+FQxWpNRAFgItkxMbnPgFcx+zZXjQJVkBtvjEgOa1g/f+Sn0kQGLW0C/dsSZoz5+o
+Knqc5fFVPJWH382R74QJwi7AIy5spcEg5tK1P1rin7g2PYqZyT5RBzmCPbpTsYm2
+ivyYh1imiU7hjVtiJXZPSaWkJr13eoANuG5xURLnr4p6xWU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at: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.ist.ac.at/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.ac.at/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">ist.ac.at</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAKNzZl6QxKuXj/y1k1CBCEO3WHNBMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQ0WhcN
+MzUwNjMwMTAzNTQ0WjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmrQyKAjpM8u8AIxqUkiWFMlkUNiPdlVl
+YcZfFr/2C5iCKC+vRMsgcYBCiZodc9mw0BovZbf4A4T6c3oYgqTIzuSASArR9imL
+u3xYHXUa7bsjge2AZ1SXfQwkaCWyIyMcqqvD0EV4KbZkzNjZ3nzqLX9fAeQ+s51h
+XRO1G50Qq1s4RvJMjZK6j1mn6xdZHx24+D0G3GC4f6Ob6KOslLDWc97uQGmaNBs2
+LLt79q57AKao81QVhP8q94RBQ5OL8ACP+3xYPa71zaDGcixiHUoco527Gr9y+UQp
+8mSM1pQ/16PtAZsDNipwlNgJYt4mcOYi9zkiu0m64zJTeTSi7d46MQIDAQABo2Ew
+XzAdBgNVHQ4EFgQUSLkMFfObfFFP5jchC3yED/7pJmgwPgYDVR0RBDcwNYINaWRw
+LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAIIjhAwz/xp8LkOtIofUj5qLa3Axta3vcUuviZ
+cYLtEfhCb2dvtj3qwlHz6AeIjBRtuKlptX4Bexg9uA0QYSz+xPXiu43O3qqns/Nb
+5HXFKsCDpRtIZdfYhSJwh5TftsjsYn5zuE34fjPkozjfuHZIIxuVlQW1lELpql1u
+LI5BtXvOmtCt9MxwZ6lwywPSsTeBNKsFuS0Dp4lUBRoSgWu90CiKHkoGLUOUPrlN
+J1TxfFmf6lEHmb7zvSgo8Uchp/uYF7AZ7n8h8Sc+BIXaMAsLlUeFsYJLu18y90Xl
+ojDt/GTfp8exfqbFUriqj6Xhf5eu9fSY/jsodmVaOw2GoZmN</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>
+MIIDIDCCAgigAwIBAgIVAJUtQynzhfho/ZFcuyGKElEn3i4KMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQzWhcN
+MzUwNjMwMTAzNTQzWjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7vDO+qkovMUtazg1uUhu1DJ8OqCnR/n
+xdl24Vdh8gpQJsTrmg3mbpkKXzQcrmbyMVwc0XRk7wq/Fh0QQ2V2OCMkNJ9FSN/j
+VstBWjFeLCL89lYSiW1IFhYC8czmhMY67hOO9NnZB3j3T4wZVPHoALF3n+rTcCGb
+yKjbTZw32oyMZoAUkmFaQPJFvbpAziKj9w/BU+8NVCsO/PXIyVprifIXKcMYtnUr
+Tj4d6U9nurnUPXBrSuvgTsY7+zJ5jpkGGUzTSZHrPHw1FnxJSNRFxSWBIpXH5rZZ
+z6k4I6QRrgrVIcbJbvPyGKOFqGa9ZUdZZZQr3TfEsnl0D8M1SqTk6wIDAQABo2Ew
+XzAdBgNVHQ4EFgQUxeXktWyuUPNEbJZWDV4UPOsTWMMwPgYDVR0RBDcwNYINaWRw
+LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAXFWeu5vQU22HKaW3vXS4f/OcnOnlQQa1GbrJg
+D7JnoKP2j+RGecYxDQAS5+o5LbBb7wh25hHCM/OuOImbGugN253OR7kCknuMc50+
+ihXXSPFWjL0Gd68pKk3wXJJnIavwB/Evi80hVxL4dDBT498ZiwTE2vTRF1FHlj3O
+b8x/yObUbZVe9wHEr1SxOtMTOSJIb1ns0Br6H+Wji/o6LjSavZYAnxydgnhxcixn
+p9lET5YFTpHa31MRrKpb4XM+sYfrQ0khIhMyLm6BzIkuFaNpxpm/x+bOQEJwoeIW
+dulXVfj+LyVXzjp8pM9wRPfaAFbzZzCLj174b6/CfHWXl7IP</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>
+MIIDHzCCAgegAwIBAgIUeq9cJechTNP7ey2ymp1zDhsMOiswDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNaWRwLmlzdC5hYy5hdDAeFw0xNTA2MzAxMDM1NDRaFw0z
+NTA2MzAxMDM1NDRaMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgocYifpqC91GEQ1TKcyH2RuAK+eX/iStm
+Fzem7rAU/MWscL5ZEnMVwzkG1PPK1VV5EAf1WwWdfK5nxj9YCnXuq3rdtIB5+fJK
+eb8Mli+Xv8xa542cdMF5EkXaf/1iFpd+agXTd9DzjwRF4ONa5uZqEwoTY02fE1dq
+XYV4lkBC8ATfoCE6u5sUHYYJFFI8aAI61POm7CatYrVXYINMy8fubhOW/yhjdJ+S
+4/LN9d0WXrFhJu1+Cw/FYluoYXuhbwpKB2cJLnVlJjWh36TI6D6BaOPxOvgfSPGQ
+IAusp6jusBZzP4ujpmUP7HxcZemq4N0RPINrq6OERG6t/ICVmH3zAgMBAAGjYTBf
+MB0GA1UdDgQWBBSYxs9vRSPODbzitnbft+HnthjuPjA+BgNVHREENzA1gg1pZHAu
+aXN0LmFjLmF0hiRodHRwczovL2lkcC5pc3QuYWMuYXQvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAA1+R1p90OWn1Fizf8UW+vlrdPYf68yFb8snFMxC
+ssFbT6K7YzQRrBmzVeSbDqth85hjibxiPnqivbTK9YBfpX4Q8dd/MxfU9vxHvJoB
+/frFb/nP0OakEcmFma1wln0eIzMofpcKlCJaM38tDGS9bnw6XP19hLAutIzTNH0N
+FQxWpNRAFgItkxMbnPgFcx+zZXjQJVkBtvjEgOa1g/f+Sn0kQGLW0C/dsSZoz5+o
+Knqc5fFVPJWH382R74QJwi7AIy5spcEg5tK1P1rin7g2PYqZyT5RBzmCPbpTsYm2
+ivyYh1imiU7hjVtiJXZPSaWkJr13eoANuG5xURLnr4p6xWU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://ist.ac.at/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>IT</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>IT</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
index f852a8a9..9fff0d8c 100644
--- a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mba.ac.uk/idp/shibboleth">
<!--
- This is a Shibboleth IdP for The Marine Biological Association of the United Kingdom.
+ This is a Shibboleth IdP for The Marine Biological Association of the United Kingdom.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-16T15:47:41Z">
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 32c71a1b..00000000
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
- <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">nesc.gla.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</mdui:DisplayName>
- <mdui:Logo height="168" width="198">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
- BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
- MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
- 44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
- fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
- vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
- An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
- Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
- ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
- czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
- Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
- YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
- Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
- As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
- v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
- Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
- XuZK6AuQhAE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nesc.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nesc.gla.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">nesc.gla.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
- BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
- MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
- 44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
- fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
- vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
- An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
- Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
- ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
- czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
- Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
- YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
- Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
- As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
- v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
- Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
- XuZK6AuQhAE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
- <OrganizationDisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.nesc.ac.uk/hub/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml
deleted file mode 100644
index b69d3d6b..00000000
--- a/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.primarylogon.co.uk/idp/shibboleth">
- <!--
- This is a Shibboleth 2.1.3 IdP for Primary Technology.
- -->
- <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">primarylogon.co.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUQ20GO37EJbue7ZaBBSMki0eG82cwDQYJKoZIhvcNAQEF
- BQAwITEfMB0GA1UEAxMWaWRwLnByaW1hcnlsb2dvbi5jby51azAeFw0wOTEwMjIx
- NTU4NDVaFw0yOTEwMjIxNTU4NDVaMCExHzAdBgNVBAMTFmlkcC5wcmltYXJ5bG9n
- b24uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJq+LMWRR
- EN3RrE7Azt7yhROagAU9o+LqtbnbsAOOisiNWbbrLcsO4BzgSFZ3Zvge9YbBb1VC
- axUOAr5ZzqId4vl/OAO6rIWZ+bGbB9RRTnTI5Rd8C0s5tePvBiiDZZh1AIH9PrIe
- E61txemyE9tVB/PiAhB9ozll1PN9e1tZdaMd6f/51ulAU0HTq0RS2DUwhkuD10un
- accS7y+ew8WrnTSlU2x5wkEJUS/ZLGkKB9q03ahqQuzJL0R0yaxRUv9inr6Wj09D
- wJOJWlDDmclQ4lgKZ2gHSPWUWvKhXggUJrGKnSJqAxRxbn/lxowBl1ErMRoG8LNi
- cmMl2GmYZgZNAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC5wcmltYXJ5bG9nb24u
- Y28udWuGLWh0dHBzOi8vaWRwLnByaW1hcnlsb2dvbi5jby51ay9pZHAvc2hpYmJv
- bGV0aDAdBgNVHQ4EFgQUMkwl5JK1XdA5VVLrjQ3e2mYUX8wwDQYJKoZIhvcNAQEF
- BQADggEBADiFXuTUWkokd4aKWZcZfBAJboPnFiQu/LlfSuVaAjESDRgKMlOMfXdt
- OKLHm0bYtODsDjibIfGZJo7kmJaeJdax2lMrU2jFD6TXZpKmUpYfBi/oiDfEfiBt
- OLkHmpVbD0g9i/dSb2xiMTCsLiyZe18D9dKskIKlcO4p3X8TrpWRYQ7CqO5izyr6
- yFjqUtWwlxtWbYmA5PJHZpJAOgG98vb7nrptPbb32axj72eB5dL4F7frICwxernU
- /0T6Ly1eo1rVrkAdRm2QIJyQZYe7jvPoEsIsq639OXrXDqED+7oKUf6GZYbjIu2Y
- zRa5RaATgOB2sVdg2eOTs4eqQd1dU6s=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.primarylogon.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.primarylogon.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.primarylogon.co.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.primarylogon.co.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.primarylogon.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.primarylogon.co.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">primarylogon.co.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUQ20GO37EJbue7ZaBBSMki0eG82cwDQYJKoZIhvcNAQEF
- BQAwITEfMB0GA1UEAxMWaWRwLnByaW1hcnlsb2dvbi5jby51azAeFw0wOTEwMjIx
- NTU4NDVaFw0yOTEwMjIxNTU4NDVaMCExHzAdBgNVBAMTFmlkcC5wcmltYXJ5bG9n
- b24uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJq+LMWRR
- EN3RrE7Azt7yhROagAU9o+LqtbnbsAOOisiNWbbrLcsO4BzgSFZ3Zvge9YbBb1VC
- axUOAr5ZzqId4vl/OAO6rIWZ+bGbB9RRTnTI5Rd8C0s5tePvBiiDZZh1AIH9PrIe
- E61txemyE9tVB/PiAhB9ozll1PN9e1tZdaMd6f/51ulAU0HTq0RS2DUwhkuD10un
- accS7y+ew8WrnTSlU2x5wkEJUS/ZLGkKB9q03ahqQuzJL0R0yaxRUv9inr6Wj09D
- wJOJWlDDmclQ4lgKZ2gHSPWUWvKhXggUJrGKnSJqAxRxbn/lxowBl1ErMRoG8LNi
- cmMl2GmYZgZNAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC5wcmltYXJ5bG9nb24u
- Y28udWuGLWh0dHBzOi8vaWRwLnByaW1hcnlsb2dvbi5jby51ay9pZHAvc2hpYmJv
- bGV0aDAdBgNVHQ4EFgQUMkwl5JK1XdA5VVLrjQ3e2mYUX8wwDQYJKoZIhvcNAQEF
- BQADggEBADiFXuTUWkokd4aKWZcZfBAJboPnFiQu/LlfSuVaAjESDRgKMlOMfXdt
- OKLHm0bYtODsDjibIfGZJo7kmJaeJdax2lMrU2jFD6TXZpKmUpYfBi/oiDfEfiBt
- OLkHmpVbD0g9i/dSb2xiMTCsLiyZe18D9dKskIKlcO4p3X8TrpWRYQ7CqO5izyr6
- yFjqUtWwlxtWbYmA5PJHZpJAOgG98vb7nrptPbb32axj72eB5dL4F7frICwxernU
- /0T6Ly1eo1rVrkAdRm2QIJyQZYe7jvPoEsIsq639OXrXDqED+7oKUf6GZYbjIu2Y
- zRa5RaATgOB2sVdg2eOTs4eqQd1dU6s=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.primarylogon.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.primarylogon.co.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">Primary Technology Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Primary Technology: Primary Logon</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://primaryt.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>McLear</SurName>
- <EmailAddress>mailto:John@McLear.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>McLear</SurName>
- <EmailAddress>mailto:John@McLear.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..33a5d3b2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rcpi.ie/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2014-08-26T12:51:59Z"/>
+ </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">rcpi.ie</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Royal College of Physicians of Ireland</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.rcpi.ie/</mdui:InformationURL>
+ <mdui:Logo height="78" width="500">https://idp.rcpi.ie/idp/images/logo.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUH9bbvnLR0v9pD3ammqi5YFwsHv0wDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnJjcGkuaWUwHhcNMTIxMjEwMTUzNTUwWhcNMzIx
+MjEwMTUzNTUwWjAWMRQwEgYDVQQDEwtpZHAucmNwaS5pZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIxoKUdA04fWoW2MLF3uQUqwBGvBj2SSISJiBmNI
+eNRRNW8ARx0/HtpvXTHwTJkQ137YVlYXz8cCFuKpgPBXqyxOX+IErBuyWKLezuW9
+1jep3R6YVAYg5D8keXAda4iE/cAzBXnujAboBWFrvK0H+UFKNjIrvKB0EgcnXnF2
+BNy0bngue3lZiqlR4vZSff1BZ5RgvuvAsGz1PX/3Zmow1HSLUY0i8cVkEabMrirV
+f+fPW3GWyV2pHIeTKpkAMehXYvb00W/M+Ct1yN3pSUfr2YlLYDkQIwvHI1VOZmwz
+hcUclwWisvLwFLi6jH7X24b0WrWS1JZu4nQsH503Tl2TECUCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnJjcGkuaWWGImh0dHBzOi8vaWRwLnJjcGkuaWUvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFJDWXw5QGD8eaX9YnvK5tXi4pNdbMA0GCSqGSIb3
+DQEBBQUAA4IBAQBmv7sihWS+vdXCIz2ISFuElyJmFjdziPHv9K50LlMays+FVSKz
+0vtlVdBVPgR2H64z1UocoCiMWiB8CdM2jMFoF1KGFgV2rRl2KiHHPxB4zvW8CnB8
+53T5BT8aZWNV8TM3H7UXgfjuVeC2sb+Ka93uzvCyDS0PWPs3TknFRotVyzWPWe86
+YINLSp6w3cT9k2al0TQwNlzhwGwK9JvFUuzUU5SK0viHoIxdlFSxzZhJxggzmrW8
+8s9Q6HryWs7l9TSCCHb740jYCApjJ1vafAHbgbtBMtHg6mqPLrDDbBTO3Vq0JnmP
+28uRVtp9EMa9ZdTxX444lGzBxeNZWeerUjQG
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.rcpi.ie/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Richard</md:GivenName>
+ <md:SurName>Eibrand</md:SurName>
+ <md:EmailAddress>mailto:richardeibrand@rcpi.ie</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Adrian</md:GivenName>
+ <md:SurName>Rath</md:SurName>
+ <md:EmailAddress>mailto:AdrianRath@RCPI.IE</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>RCPI</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@rcpi.ie</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
index d28d070b..bcb7f677 100644
--- a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
@@ -9,7 +9,7 @@
</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">rnp.br</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
<mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
@@ -54,7 +54,7 @@ ktvi8RxRxbw=
</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">rnp.br</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false"/>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
index 37342874..ae615fde 100644
--- a/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
@@ -32,47 +32,6 @@
<ds:KeyName>idp.scc.kit.edu</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
-MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
-HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
-PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
-mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
-MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
-fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
-MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
-ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
-mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
-bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
-JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
-yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
-kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
-ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
-ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
-zea6MPIosg==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
@@ -131,47 +90,6 @@ DDtygfMFcJ7uU7YOIBUyd7s1m23ZZzi6HkTPEtM=
<ds:KeyName>idp.scc.kit.edu</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
-MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
-HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
-PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
-mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
-MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
-fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
-MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
-ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
-mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
-bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
-JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
-yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
-kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
-ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
-ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
-zea6MPIosg==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
diff --git a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
index a52e3875..6a17d509 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
@@ -147,8 +147,8 @@
<EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Kieran</GivenName>
- <SurName>Whitbread</SurName>
- <EmailAddress>mailto:k.j.whitbread@qmul.ac.uk</EmailAddress>
+ <GivenName>Tom</GivenName>
+ <SurName>Jordaan</SurName>
+ <EmailAddress>mailto:steven.t.s.jordaan@qmul.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
index 21f75cad..afed4b73 100644
--- a/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
@@ -10,6 +10,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorbonne-universites.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Sorbonne University</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAD////////////////s5d//uZ2H/41eOv92PhP/bDEC/2wwAv91PRL/jmA9/76jj//x6+f////////////////////////////VxLf/iFgy/2swA/9oKgD/ay8C/3A2Cf9wNgj/ai4B/2gqAP9tMgT/kGNA/+DUyv/////////////////czsP/e0Yd/2gqAP93PxX/onxf/7+mkf+8oYz/up6J/7ichf+VaUj/bjMH/2grAP+HVjH/6eHa///////59/X/mXBR/2cqAP+GVjD/283B/+ng2v+feFn/ekQZ/3lCGP+acVH/4tbN/7yhi/9xNwv/aSwA/62Mc/////7/4NPJ/3dAFv9xNwr/08K0//79/f+ifWD/aCsA/2ouAP9qLgD/aCoA/6yKcf/8+vn/on1f/2gqAP+FUy3/8Onl/8q0pP9tMgT/eUMY/+fd1v/h1Mv/eEEY/2ouAP9rLwD/ay8A/2grAP+feFv//////825qf9sMQL/dj4T/9/SyP/ErZr/bTED/2wxA/+MXTn/hVMt/2svAP9rLwD/ay8A/2otAP9xNwz/zbio///////UwrX/bjMF/3M6Dv/azMD/xK2a/20yA/9rLwD/aSwA/2otAP9rLwD/ai4A/2ksAP97Rh3/waiV//z6+f//////up6I/2otAP9zOw7/2szA/8Stmv9tMgP/ay8A/2svAP9rLgD/aSwA/3U+E/+ng2f/5NnR//7+/v//////5tzU/4NRKv9pLAD/czsO/9rMwP/ErZr/bTID/2svAP9qLgD/bzQI/5tzU//czcL//Pv6///////+/f3/3M3C/4xdOf9qLQD/ay4A/3M7Dv/azMD/xK2a/20yA/9qLgD/czoO/7+kkP/59/X///////7+/v/n3tf/ro1z/3hBF/9pLQD/ay8A/2suAP9zOw7/2szA/8Stmv9tMgP/ai0A/6uJbv/9/Pz//////+7n4v+1l4D/fUkg/2otAP9qLgD/ay8A/2svAP9rLgD/czsO/9rMwP/ErZr/bTED/240Bv/UwrX//////9nJvf+IVzH/ai4B/2otAP9rLwD/ay8A/281CP9vNAb/ai4A/3M7Dv/azMD/xK2a/20xA/9vNQf/1sa5//n39f+OYT7/aCsA/2svAP9rLwD/ay8A/2ktAP+XbU3/hVMt/2ksAP9zOw7/2szA/8Ssmv9rMAP/aCsA/7CReP/18u7/i105/2ksAP9rLwD/ay8A/2ouAP9yOQ3/x7Cf/4ZVMP9nKgD/cjkO/9rLwP/TwbT/kWVC/49iPv+feFr/7ufi/8q0o/93QBX/ai4A/2svAP9wNgn/r492//Dq5v+jfWD/j2E9/5ZsS//k2ND/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.sorbonne-universites.fr/</mdui:InformationURL>
<mdui:DisplayName xml:lang="fr">Sorbonne Universités</mdui:DisplayName>
<mdui:Description xml:lang="fr">Personnels de la ComUE</mdui:Description>
diff --git a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
index e0833b1e..486ee69e 100644
--- a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
@@ -12,41 +12,34 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIFsDCCBJigAwIBAgIQXu8JCm8fuup6gdylhWdWFDANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDgxMDAwMDAwMFoXDTE1MDgxMDIzNTk1OVowgY0xCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIEw1UeW5lIEFuZCBXZWFyMRYwFAYDVQQHEw1Tb3V0aCBT
- aGllbGRzMR8wHQYDVQQKExZTb3V0aCBUeW5lc2lkZSBDb2xsZWdlMRUwEwYDVQQL
- EwxJQ1QgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5zdGMuYWMudWswggIiMA0GCSqG
- SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2QlogZqPu+Z+g/fH48fbj6ftQrRICRWGq
- fWJkiDaqVEdbMHgaiYeiexHwTSflThrH+MtOdrxtNpjXp1v9jl62fhHUbxKE2X4K
- uWHTZcGg3XvuzIcv7rQMfMtTOCvyFyEoxsRcSaSFvRPo4Vc6uGXFUJGDICOR5DjO
- fgh8XlE0G3WD3xKAMF6h1I+XB6a1I0bN8vTdg1Ug38XCovOrN7Dhu7QVh+WjvLlx
- du1xJaMh90wIhHyGwIZAZazgljo5jKwcCR1b0Izdj904ao5DGkrYpOEhb9hBSTtB
- Jco0VjfiKNj0cnT95+F7+RGsQv5xtV62Vg10YoXQGhF+TmmXmOW+5p6uJrhNQJ6z
- Nx4WjWjlGrW/QfAsZii5refcg4EyEWXJ1GTVrMvQFHwlT6RXokw6dO2Us79v43DK
- ikb0fehn+3t9yzWhhyHU/756OH96os6iWA3oALqANiXHGQJBdT+oOL4Q7if+tKvu
- exMi6LKrbt3QigZORAWq27G6nAx3jcRn+pzGpLt19XXOhKyokw4HeBCoZSoMR5JF
- xNfH4KIvE41mZ7U3tro2x1NrCnmATFQXBV5HBecpHJPFzI+yNcw+Ek1dRkGztG/g
- 0frtiX8QVgzDdJpmAkO8BKi4cqMQg8RXnNnvnadDR4YgceyUfVqnzRuVP4lSI9Lr
- 5dsaeWfgdwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFMO0dzzS4yDzx1HflQE8b+bjHpzPMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
- dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
- BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
- RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
- bmEub3JnMBgGA1UdEQQRMA+CDWlkcC5zdGMuYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAFMVDYePuVrK9grWcvMbr96/WPdaRKywCzN9mjRxwhTyINqqMIaGShaKF01l
- rknCZJ8qcyl3Kp/4Xkc419W8ZMBnjtwtCaGJMss2lk9lbLU3s2aAULg/DJ2kqakS
- yO3Eya3tyb0vwqYmAbPbj2nJBHwCTo4e9wCXyXSugJXtb/MxnP4DvI0ZWct+h5p4
- STKILRVEltuP/BGnvDudPhzPg75fGliy4EDA4BPj93uQnbkkDprcRQFIiit13YLg
- JlZQysM+JuuivWbK1cEl3rJloysn1G5cX53BoFSqwj9hsZp0vXRYvZ+TzOS7NFYy
- Idc6Eao+Yumry94nrhXQv0brzfQ=
+ MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
+ czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
+ IFNlcnZpY2VzMRYwFAYDVQQDDA1pZHAuc3RjLmFjLnVrMSEwHwYJKoZIhvcNAQkB
+ FhJoZWxwZGVza0BzdGMuYWMudWswHhcNMTUwNzI5MDkxMzQ4WhcNMjUwNzI2MDkx
+ MzQ4WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxFjAUBgNVBAcM
+ DVNvdXRoIFNoaWVsZHMxHzAdBgNVBAoMFlNvdXRoIFR5bmVzaWRlIENvbGxlZ2Ux
+ FTATBgNVBAsMDElDVCBTZXJ2aWNlczEWMBQGA1UEAwwNaWRwLnN0Yy5hYy51azEh
+ MB8GCSqGSIb3DQEJARYSaGVscGRlc2tAc3RjLmFjLnVrMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEApEZ0XWtW2m/iOq10H+uBFrLZTuAHM9KnTUMP0ox5
+ e+4WgZrg5u+k1yJewbnlqyibexk+wWNPrKzIO5NSdAGhl2uOIq3wDOvoxx972UXL
+ 7dDSyFZeTYzsRaCrqjcBfr/d9MpoZyXqGL9wQ/gbetNvOvNNaD3L0U9r4bDBYox5
+ d1X1fNvuoDc/eHo8ZeRvJZ27gWKJ42zB9DlD9g1aDYmkUkwVjm0fBcLZMxB4pyqw
+ TptwzLgVzCG/haLzW9TD3QU33++CQKL9WUJzwUHJAC2OPQIupYWusrnu0lDHoFma
+ 33uv9tHbm60fCkZkrh7oi4rWIyaE6vC50S2wX701gpsPLQIDAQABo3sweTAJBgNV
+ HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+ Y2F0ZTAdBgNVHQ4EFgQUpywsb6c9Gnj9ZkZ53piQHFyHgvQwHwYDVR0jBBgwFoAU
+ pywsb6c9Gnj9ZkZ53piQHFyHgvQwDQYJKoZIhvcNAQELBQADggEBADfNyBuwa/Gy
+ U95f4+Ko6FX2vFMAFVsXqk4Ab1vPIAf2D/dBwRqXUZo3V5ySOmMog1CB1GkeFWNq
+ xPXS1wFlQ65RGGk867oerHcHpRMWdwTYM0RQzA3Hx43iwVavVneLBNdKyYKR9Zzk
+ Hk4shGwqX2F1nntw7kdVdq1YqZ3bh3Vebq5qQIQkweRSkbERFO9aXGFN/kWutbcz
+ UhpUBEUi/UtOqkZuM+TRALVZ607weHpGyBGI7jwDcmWXVO9YmeDc8emteYxs8dAm
+ jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
+ nO1NevMrfrw=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -64,41 +57,34 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIFsDCCBJigAwIBAgIQXu8JCm8fuup6gdylhWdWFDANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDgxMDAwMDAwMFoXDTE1MDgxMDIzNTk1OVowgY0xCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIEw1UeW5lIEFuZCBXZWFyMRYwFAYDVQQHEw1Tb3V0aCBT
- aGllbGRzMR8wHQYDVQQKExZTb3V0aCBUeW5lc2lkZSBDb2xsZWdlMRUwEwYDVQQL
- EwxJQ1QgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5zdGMuYWMudWswggIiMA0GCSqG
- SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2QlogZqPu+Z+g/fH48fbj6ftQrRICRWGq
- fWJkiDaqVEdbMHgaiYeiexHwTSflThrH+MtOdrxtNpjXp1v9jl62fhHUbxKE2X4K
- uWHTZcGg3XvuzIcv7rQMfMtTOCvyFyEoxsRcSaSFvRPo4Vc6uGXFUJGDICOR5DjO
- fgh8XlE0G3WD3xKAMF6h1I+XB6a1I0bN8vTdg1Ug38XCovOrN7Dhu7QVh+WjvLlx
- du1xJaMh90wIhHyGwIZAZazgljo5jKwcCR1b0Izdj904ao5DGkrYpOEhb9hBSTtB
- Jco0VjfiKNj0cnT95+F7+RGsQv5xtV62Vg10YoXQGhF+TmmXmOW+5p6uJrhNQJ6z
- Nx4WjWjlGrW/QfAsZii5refcg4EyEWXJ1GTVrMvQFHwlT6RXokw6dO2Us79v43DK
- ikb0fehn+3t9yzWhhyHU/756OH96os6iWA3oALqANiXHGQJBdT+oOL4Q7if+tKvu
- exMi6LKrbt3QigZORAWq27G6nAx3jcRn+pzGpLt19XXOhKyokw4HeBCoZSoMR5JF
- xNfH4KIvE41mZ7U3tro2x1NrCnmATFQXBV5HBecpHJPFzI+yNcw+Ek1dRkGztG/g
- 0frtiX8QVgzDdJpmAkO8BKi4cqMQg8RXnNnvnadDR4YgceyUfVqnzRuVP4lSI9Lr
- 5dsaeWfgdwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFMO0dzzS4yDzx1HflQE8b+bjHpzPMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
- dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
- BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
- RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
- bmEub3JnMBgGA1UdEQQRMA+CDWlkcC5zdGMuYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAFMVDYePuVrK9grWcvMbr96/WPdaRKywCzN9mjRxwhTyINqqMIaGShaKF01l
- rknCZJ8qcyl3Kp/4Xkc419W8ZMBnjtwtCaGJMss2lk9lbLU3s2aAULg/DJ2kqakS
- yO3Eya3tyb0vwqYmAbPbj2nJBHwCTo4e9wCXyXSugJXtb/MxnP4DvI0ZWct+h5p4
- STKILRVEltuP/BGnvDudPhzPg75fGliy4EDA4BPj93uQnbkkDprcRQFIiit13YLg
- JlZQysM+JuuivWbK1cEl3rJloysn1G5cX53BoFSqwj9hsZp0vXRYvZ+TzOS7NFYy
- Idc6Eao+Yumry94nrhXQv0brzfQ=
+ MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
+ czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
+ IFNlcnZpY2VzMRYwFAYDVQQDDA1pZHAuc3RjLmFjLnVrMSEwHwYJKoZIhvcNAQkB
+ FhJoZWxwZGVza0BzdGMuYWMudWswHhcNMTUwNzI5MDkxMzQ4WhcNMjUwNzI2MDkx
+ MzQ4WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxFjAUBgNVBAcM
+ DVNvdXRoIFNoaWVsZHMxHzAdBgNVBAoMFlNvdXRoIFR5bmVzaWRlIENvbGxlZ2Ux
+ FTATBgNVBAsMDElDVCBTZXJ2aWNlczEWMBQGA1UEAwwNaWRwLnN0Yy5hYy51azEh
+ MB8GCSqGSIb3DQEJARYSaGVscGRlc2tAc3RjLmFjLnVrMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEApEZ0XWtW2m/iOq10H+uBFrLZTuAHM9KnTUMP0ox5
+ e+4WgZrg5u+k1yJewbnlqyibexk+wWNPrKzIO5NSdAGhl2uOIq3wDOvoxx972UXL
+ 7dDSyFZeTYzsRaCrqjcBfr/d9MpoZyXqGL9wQ/gbetNvOvNNaD3L0U9r4bDBYox5
+ d1X1fNvuoDc/eHo8ZeRvJZ27gWKJ42zB9DlD9g1aDYmkUkwVjm0fBcLZMxB4pyqw
+ TptwzLgVzCG/haLzW9TD3QU33++CQKL9WUJzwUHJAC2OPQIupYWusrnu0lDHoFma
+ 33uv9tHbm60fCkZkrh7oi4rWIyaE6vC50S2wX701gpsPLQIDAQABo3sweTAJBgNV
+ HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+ Y2F0ZTAdBgNVHQ4EFgQUpywsb6c9Gnj9ZkZ53piQHFyHgvQwHwYDVR0jBBgwFoAU
+ pywsb6c9Gnj9ZkZ53piQHFyHgvQwDQYJKoZIhvcNAQELBQADggEBADfNyBuwa/Gy
+ U95f4+Ko6FX2vFMAFVsXqk4Ab1vPIAf2D/dBwRqXUZo3V5ySOmMog1CB1GkeFWNq
+ xPXS1wFlQ65RGGk867oerHcHpRMWdwTYM0RQzA3Hx43iwVavVneLBNdKyYKR9Zzk
+ Hk4shGwqX2F1nntw7kdVdq1YqZ3bh3Vebq5qQIQkweRSkbERFO9aXGFN/kWutbcz
+ UhpUBEUi/UtOqkZuM+TRALVZ607weHpGyBGI7jwDcmWXVO9YmeDc8emteYxs8dAm
+ jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
+ nO1NevMrfrw=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
index f13fea42..c0e0a45f 100644
--- a/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
@@ -91,6 +91,6 @@
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>IDP Admins</GivenName>
- <EmailAddress>mailto:computerservices@swindon.ac.uk</EmailAddress>
+ <EmailAddress>mailto:support@swindon.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml
deleted file mode 100644
index ffe2a48e..00000000
--- a/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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.ta.belnet.be/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn: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">ta.belnet.be</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Belnet Technical Advisors</mdui:DisplayName>
- <mdui:Description xml:lang="en">Technical Advisors test infra for customers workshops</mdui:Description>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:IPHint>193.191.128.64/26</mdui:IPHint>
- <mdui:IPHint>2001:6a8:e80:0::/48</mdui:IPHint>
- <mdui:DomainHint>ta.belnet.be</mdui:DomainHint>
- <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDKzCCAhOgAwIBAgIUEUEZDGqjNfKukFfppYWY6Nuvmd0wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLnRhLmJlbG5ldC5iZTAeFw0xNTAyMTYxNTA5NDBa
-Fw0zNTAyMTYxNTA5NDBaMBsxGTAXBgNVBAMTEGlkcC50YS5iZWxuZXQuYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe+K+stoVDx1upw+KpAeFMGvmh
-427wXk1etEQ4Aym2abP42RypkE4oMy9MJ6EVLP4+hwj9YvLL0CWLi0v+9Jg9ixbR
-1RH5RY3aJoUWHASoV0iyoFs2MB+5XkRt/VA7EGRNFbT1BLuWKjWKZS8knE5GcJw0
-3ER7PGdaP+FFhXyfNoA88xybjI7Xq/N/4f1Dg5bJ0yFZV6nW3hXRx7h5hD2sbz6J
-Olh5XaepbWrI93+TQ5dZJ/EQWPz+Gv5evRA42ZrZMB6d1FZwii4eZUPPreOOGrhI
-1+ANwmXCX6bnzu34c4hH/bsXOzc99aSLXQoYsX4vr0UnI21ZOJVUGRAg0rVzAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC50YS5iZWxuZXQuYmWGJ2h0dHBzOi8vaWRw
-LnRhLmJlbG5ldC5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjfpKnrtzekXc
-imJB5lS/NNpSshUwDQYJKoZIhvcNAQEFBQADggEBAB2PAXlLZNK/lWTytZb+A0RR
-0PvjSRtRMGyhv7A6w+3wthMk2eEyvPGSBDS9VPKCHgy4bSGcToM+MdNGuk5wO7Ve
-2+3Z3gDTTyHbVeXHTFNTbCJ567oRnXdJtEPTUwgmLgcXzp2TeU9jhklAmLLMfVYt
-vEapHf2YT2sTLfMVLSpWu8khcTvcEGY7MueTmJ2xLOKo34eIAntiJhoZZb9Z4kx2
-kfgaqkCPwGS+CTeTjyPx79d40qT4CnyWjBeQlZbXheU5Edt/dWU/Z0GPfR2gweej
-/twrx9GPlAFErvOmqrUdsAldbeIkJXb0rVvyjvp8kpw7ZURp5XQNPpFaDJElRn8=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ta.belnet.be/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ta.belnet.be/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ta.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ta.belnet.be/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">ta.belnet.be</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDKzCCAhOgAwIBAgIUEUEZDGqjNfKukFfppYWY6Nuvmd0wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLnRhLmJlbG5ldC5iZTAeFw0xNTAyMTYxNTA5NDBa
-Fw0zNTAyMTYxNTA5NDBaMBsxGTAXBgNVBAMTEGlkcC50YS5iZWxuZXQuYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe+K+stoVDx1upw+KpAeFMGvmh
-427wXk1etEQ4Aym2abP42RypkE4oMy9MJ6EVLP4+hwj9YvLL0CWLi0v+9Jg9ixbR
-1RH5RY3aJoUWHASoV0iyoFs2MB+5XkRt/VA7EGRNFbT1BLuWKjWKZS8knE5GcJw0
-3ER7PGdaP+FFhXyfNoA88xybjI7Xq/N/4f1Dg5bJ0yFZV6nW3hXRx7h5hD2sbz6J
-Olh5XaepbWrI93+TQ5dZJ/EQWPz+Gv5evRA42ZrZMB6d1FZwii4eZUPPreOOGrhI
-1+ANwmXCX6bnzu34c4hH/bsXOzc99aSLXQoYsX4vr0UnI21ZOJVUGRAg0rVzAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC50YS5iZWxuZXQuYmWGJ2h0dHBzOi8vaWRw
-LnRhLmJlbG5ldC5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjfpKnrtzekXc
-imJB5lS/NNpSshUwDQYJKoZIhvcNAQEFBQADggEBAB2PAXlLZNK/lWTytZb+A0RR
-0PvjSRtRMGyhv7A6w+3wthMk2eEyvPGSBDS9VPKCHgy4bSGcToM+MdNGuk5wO7Ve
-2+3Z3gDTTyHbVeXHTFNTbCJ567oRnXdJtEPTUwgmLgcXzp2TeU9jhklAmLLMfVYt
-vEapHf2YT2sTLfMVLSpWu8khcTvcEGY7MueTmJ2xLOKo34eIAntiJhoZZb9Z4kx2
-kfgaqkCPwGS+CTeTjyPx79d40qT4CnyWjBeQlZbXheU5Edt/dWU/Z0GPfR2gweej
-/twrx9GPlAFErvOmqrUdsAldbeIkJXb0rVvyjvp8kpw7ZURp5XQNPpFaDJElRn8=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">
- Belnet TA Lab
- </md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">
- Belnet TA Lab
- </md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">
- http://www.ta.belnet.be/drupal
- </md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Nicolas Loriau</md:GivenName>
- <md:SurName>Nicolas Loriau</md:SurName>
- <md:EmailAddress>nicolas@belnet.be</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
deleted file mode 100644
index 09d4e870..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux2.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-22T13:59:16Z">
- <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">u-bordeaux2.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Bordeaux 2 - Victor Segalen</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>
- MIIDMzCCAhugAwIBAgIUc4KqBCpHPbcVzlUyb7nDoJn4CK0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZyMB4XDTA5MDYyMzA5MTUy
-MVoXDTI5MDYyMzA5MTUyMVowHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktJPvpXPKI/6Nl1dysLc
-oZZCrvCg9QhUW+ELfNLGBR4p8FmkXC/1RT7osvEt6MsFVhjtOO/3idpbQkqXhlMD
-ORfcm4hSPDCoEM1OmlwlfHBqeVVb+rfLzEswAQt/v+/IGo3cY9ISa+zUbIEOy5Nu
-+LXG1qYd8/tadV7kgsv+kgvCpkspwdqQArParmjboeGYnGD2E1AL3XgU42R/G3Vn
-+kNDevHVc1dk6ZKz+7ZqJy5V1pkco5+g9ydAgoTRH6si+AZc975mrzJhAfiwQsoh
-qwpm546ZLaaPXjzJim7S+jA1clc8R/ljGTBZFaWhVIUqJupj5ynAngeOW4OxECGZ
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDIuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3
-TXyR0d3UvTuQcCnpnWw/mqJyzjANBgkqhkiG9w0BAQUFAAOCAQEAWYtEQih5OA9S
-Apst2Etm8TTDUAttPVxTPkTf263R/An4g8GLngITxCBE4zySoux8KbqPAhQDoFmT
-opRajsYbdzHdQJhNXegBeFbjdr3xaPgVq10mAGk0ZHzsdjivyW2XhSDnzXXn79Xa
-etxfQrJS7o3K992BFAeje6QvjLD3428BBLS6zxMapBPQi07Qufc7Jy7cSLI8xjAj
-xnCcpD6NEdTmHoD7i4krgmzByDoFLNCnAWQAvwze60yOwOaTZy1ccnKheRE/MGuZ
-CDJF+BVT5M2AwByRtc/852lumMNLljK4Jmg9SMPqvjKJUrg6xov89NVIF5I+vOBn
-fNrBEZFRlQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux2.fr/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Laurent LAVAUD</md:SurName>
- <md:EmailAddress>laurent.lavaud@u-bordeaux2.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Doris CHAUVET</md:SurName>
- <md:EmailAddress>doris.chauvet@u-bordeaux2.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
new file mode 100644
index 00000000..57a1dfd6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ulb.ac.be/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulb.ac.be</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">ULB - Universite Libre de Bruxelles</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Universite Libre de Bruxelles</mdui:Description>
+ <mdui:Logo height="16" width="16">https://idp.ulb.ac.be/logo/ulb-small.jpg</mdui:Logo>
+ <mdui:Logo height="110" width="331">https://idp.ulb.ac.be/logo/ulb-large.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>164.15.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:06a8:11a0::/64</mdui:IPHint>
+ <mdui:DomainHint>ulb.ac.be</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:50.8119483,4.38261690</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAI/VDrWwVO0DRbxqyo/DcM/tAz8TMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC51bGIuYWMuYmUwHhcNMTMxMjE3MTQzOTM2WhcN
+MzMxMjE3MTQzOTM2WjAYMRYwFAYDVQQDEw1pZHAudWxiLmFjLmJlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkvAV355Iuf7R4zjTBDO4ZoUfuPvepv91
+XGbqq4S22w/qoTxg7WIL7/5oKszyWhFCwNJM8+zhvYaR+1KytsdO408AlJzfvJSv
+R+0ONmWjqjmBapTQ8mQauRBlGCVdSMAzc/NlVkrjuN+5aTJP2BM631PRdN4k0kne
+H4nEwMA2imVFGrEbQIj7CwVtooeLoZyYx3vhpWmBLELLjbY/P/BEUxwaGVAowQyh
+P1ZV3j5wZjv48toqU9985oPfNhJfUfCioYmpzde6Ad+YQHHZ1YSdcNRazO/Rr+zh
+ikUxfLgY4mzrwUGaJS5dLa8nyG8f6zsM8u+iU/JkTVWXm7i2Y3MnPQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAudWxiLmFjLmJlhiRodHRwczovL2lkcC51bGIuYWMu
+YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDV5wlniFNcMC9tbYdZtvRtQxvjL
+MA0GCSqGSIb3DQEBBQUAA4IBAQAFAYq5SIwtwZMtKzlZlZ+HxQQ+SXzFwsKgeouT
+W0wuOb2n+x7zrrp1AeSC5xYYAHBvX/7FYD5mzqVygllzqUelXuSEIs1v2giCSpDd
+fYuDlOe5u1Tim0k6qFFKrS813YPqI1f8y1BN4dP1phjhbYbr1adtGuRL2C0A8273
+H4voU2rFE3snkvUFazOhaU/ckeFgn16JKBAIX/n5CUD65qq0nihV1fe3jSYONlUT
+L4vi1i4VLJAvnvSp3nMLoqQkeDB1HTX5tG35t4q2Plv8tSMWvxdCMsoiN6gWBVfY
+P67aJTsrDaN9W2NHFiwumJUE4QnedbfiOJaI25iZWnEyDLBK
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ulb.ac.be/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/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">ulb.ac.be</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAI/VDrWwVO0DRbxqyo/DcM/tAz8TMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC51bGIuYWMuYmUwHhcNMTMxMjE3MTQzOTM2WhcN
+MzMxMjE3MTQzOTM2WjAYMRYwFAYDVQQDEw1pZHAudWxiLmFjLmJlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkvAV355Iuf7R4zjTBDO4ZoUfuPvepv91
+XGbqq4S22w/qoTxg7WIL7/5oKszyWhFCwNJM8+zhvYaR+1KytsdO408AlJzfvJSv
+R+0ONmWjqjmBapTQ8mQauRBlGCVdSMAzc/NlVkrjuN+5aTJP2BM631PRdN4k0kne
+H4nEwMA2imVFGrEbQIj7CwVtooeLoZyYx3vhpWmBLELLjbY/P/BEUxwaGVAowQyh
+P1ZV3j5wZjv48toqU9985oPfNhJfUfCioYmpzde6Ad+YQHHZ1YSdcNRazO/Rr+zh
+ikUxfLgY4mzrwUGaJS5dLa8nyG8f6zsM8u+iU/JkTVWXm7i2Y3MnPQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAudWxiLmFjLmJlhiRodHRwczovL2lkcC51bGIuYWMu
+YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDV5wlniFNcMC9tbYdZtvRtQxvjL
+MA0GCSqGSIb3DQEBBQUAA4IBAQAFAYq5SIwtwZMtKzlZlZ+HxQQ+SXzFwsKgeouT
+W0wuOb2n+x7zrrp1AeSC5xYYAHBvX/7FYD5mzqVygllzqUelXuSEIs1v2giCSpDd
+fYuDlOe5u1Tim0k6qFFKrS813YPqI1f8y1BN4dP1phjhbYbr1adtGuRL2C0A8273
+H4voU2rFE3snkvUFazOhaU/ckeFgn16JKBAIX/n5CUD65qq0nihV1fe3jSYONlUT
+L4vi1i4VLJAvnvSp3nMLoqQkeDB1HTX5tG35t4q2Plv8tSMWvxdCMsoiN6gWBVfY
+P67aJTsrDaN9W2NHFiwumJUE4QnedbfiOJaI25iZWnEyDLBK
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">
+ Universite Libre de Bruxelles
+ </md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">
+ ULB - Universite Libre de Bruxelles
+ </md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">
+ http://www.ulb.ac.be
+ </md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Technical Support</md:GivenName>
+ <md:SurName>Technical Support</md:SurName>
+ <md:EmailAddress>support@ulb.ac.be</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 71049dff..00000000
--- a/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umk.pl/simplesaml/saml2/idp/metadata.php">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2013-12-15T00:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.torun.pl</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University (old IdP)</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- Nicolaus Copernicus University Identity Provider (old)
- </mdui:Description>
- <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk64.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:IPHint>158.75.0.0/16</mdui:IPHint>
- <mdui:DomainHint>uni.torun.pl</mdui:DomainHint>
- <mdui:DomainHint>umk.pl</mdui:DomainHint>
- <mdui:GeolocationHint>geo:53.1234804,18.0084378</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</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>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/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.umk.pl/simplesaml/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun (old IdP)</md:OrganizationName>
- <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu (wycofywany IdP)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun (old IdP)</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu (wycofywany IdP)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>NCU IdP</md:GivenName>
- <md:SurName>Team</md:SurName>
- <md:EmailAddress>mailto:admin@umk.pl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
new file mode 100644
index 00000000..c7175ccd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vub.ac.be/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">VUB - Vrije Universiteit Brussel</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Vrije Universiteit Brussel</mdui:Description>
+ <mdui:Logo height="16" width="16">https://idp.vub.ac.be/logo/vub-small.jpg</mdui:Logo>
+ <mdui:Logo height="110" width="347">https://idp.vub.ac.be/logo/vub-large.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>134.184.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:06a8:1190::/64</mdui:IPHint>
+ <mdui:DomainHint>vub.ac.be</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:50.8213690,4.3957100</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
+MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgAg+ICRsB+l1EPx8pRtbp/W/s0DruoIHO
+wlHgtvhVToh/GDdAqDNHdhGGTSTVc77JO1j1yV3sQgczH+4Hz/bczwUCbna3ItgN
+SvnhzzFcpzdJ7MKJJaIc4CszrZG4TBA3hHaAIOsjlOz8QwG7DIhx7pF/wZktYJkQ
+RE6vC6Y579QcFqxBF8nNi+jKELWgwean36+lqIDYLhsWDye/lJ/h5dgp0W1bfYM+
+CNXNbBF5IiLY9RgypiGBtm+717vig8GVpHOsiFsN7+CPboRr0BFVwg2NEpnvlZSa
+plqYBHOlmqLDJv8l7Du6ss1Vp1eLgp/cdb0pbeBme/+NCMZIGOJvAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC52dWIuYWMuYmWGJGh0dHBzOi8vaWRwLnZ1Yi5hYy5i
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb3yOJUsB5SdaKAXaXW+Xxlub4Dgw
+DQYJKoZIhvcNAQEFBQADggEBAArzqWvBazHyT82L/HbNUH+KbrbOtgj2eiLRmWDT
+GCB1/qXuuh+WLejyvN7EJ+SBGGdWEdytBvZyAmIq4Kv4EDDupu/ynYCxP03v6oW5
+ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
+2F+EAkHGF5c4LKgMsOK4Gsjux1vi/PbAO0qiMOfsHdKM1ZUJQP+skNYkhjMCVV4d
+/h/4Ex6XuS8nqlpwIti+gqTmnULy0Aa3fBluoLmvB38uDPdlC3QkBiFbQtX+GUDG
+dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vub.ac.be/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/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">vub.ac.be</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
+MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgAg+ICRsB+l1EPx8pRtbp/W/s0DruoIHO
+wlHgtvhVToh/GDdAqDNHdhGGTSTVc77JO1j1yV3sQgczH+4Hz/bczwUCbna3ItgN
+SvnhzzFcpzdJ7MKJJaIc4CszrZG4TBA3hHaAIOsjlOz8QwG7DIhx7pF/wZktYJkQ
+RE6vC6Y579QcFqxBF8nNi+jKELWgwean36+lqIDYLhsWDye/lJ/h5dgp0W1bfYM+
+CNXNbBF5IiLY9RgypiGBtm+717vig8GVpHOsiFsN7+CPboRr0BFVwg2NEpnvlZSa
+plqYBHOlmqLDJv8l7Du6ss1Vp1eLgp/cdb0pbeBme/+NCMZIGOJvAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC52dWIuYWMuYmWGJGh0dHBzOi8vaWRwLnZ1Yi5hYy5i
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb3yOJUsB5SdaKAXaXW+Xxlub4Dgw
+DQYJKoZIhvcNAQEFBQADggEBAArzqWvBazHyT82L/HbNUH+KbrbOtgj2eiLRmWDT
+GCB1/qXuuh+WLejyvN7EJ+SBGGdWEdytBvZyAmIq4Kv4EDDupu/ynYCxP03v6oW5
+ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
+2F+EAkHGF5c4LKgMsOK4Gsjux1vi/PbAO0qiMOfsHdKM1ZUJQP+skNYkhjMCVV4d
+/h/4Ex6XuS8nqlpwIti+gqTmnULy0Aa3fBluoLmvB38uDPdlC3QkBiFbQtX+GUDG
+dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">
+ Vrije Universiteit Brussel
+ </md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">
+ VUB - Vrije Universiteit Brussel
+ </md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">
+ http://www.vub.ac.be
+ </md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Technical Support</md:GivenName>
+ <md:SurName>Technical Support</md:SurName>
+ <md:EmailAddress>support@vub.ac.be</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 9cd82424..00000000
--- a/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.youngepilepsy.org.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for The National Centre for Young People with Epilepsy.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T10:56:17Z">
- <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">youngepilepsy.org.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
- VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
- BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
- IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
- dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
- ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
- nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
- 94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
- d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
- WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
- aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
- MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
- BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
- MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
- Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
- dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
- Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
- Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
- jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
- 7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
- HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
- hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
- d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.youngepilepsy.org.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">youngepilepsy.org.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
- VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
- BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
- IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
- dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
- ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
- nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
- 94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
- d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
- WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
- aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
- MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
- BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
- MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
- Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
- dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
- Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
- Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
- jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
- 7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
- HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
- hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
- d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">The National Centre for Young People with Epilepsy</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Young Epilepsy</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://youngepilepsy.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Tyrone</GivenName>
- <SurName>da Silva</SurName>
- <EmailAddress>mailto:tdasilva@youngepilepsy.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Seager</SurName>
- <EmailAddress>mailto:cseager@youngepilepsy.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
new file mode 100644
index 00000000..a0ab58db
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.rfh-koeln.de/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-26T13:51:54Z">
+ <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">rfh-koeln.de</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Provider der RFH Köln</mdui:Description>
+ <mdui:Description xml:lang="en">Rheinische Fachhochschule Köln gGmbH, University of Applied Sciences, Sibboleth-Identity Provider</mdui:Description>
+ <mdui:Logo height="16" width="16">https://idp2.rfh-koeln.de/rfh-logo_shib_klein.gif</mdui:Logo>
+ <mdui:Logo height="64" width="346">https://idp2.rfh-koeln.de/rfh-logo_shib_gross.gif</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.rfh-koeln.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.rfh-koeln.de/index_eng.html</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="de">http://www.rfh-koeln.de/impressum/index_ger.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.rfh-koeln.de/imprint/index_eng.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcTBUtv
+ZWxuMS4wLAYDVQQKEyVSaGVpbmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdH
+bWJIMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQDEwxSRkggS29lbG4g
+Q0ExHzAdBgkqhkiG9w0BCQEWEHBraUByZmgta29lbG4uZGUwHhcNMTUwNjI0MTMx
+ODEzWhcNMTgwOTIwMTMxODEzWjCBnzELMAkGA1UEBhMCREUxHDAaBgNVBAgME05v
+cmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcMBUtvZWxuMS4wLAYDVQQKDCVSaGVp
+bmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdHbWJIMRYwFAYDVQQLDA1SZWNo
+ZW56ZW50cnVtMRowGAYDVQQDDBFpZHAyLnJmaC1rb2Vsbi5kZTCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMd4FiJgA3//s13pX0vq13lLd+t91MCueeUI
+5Z+TAB7EaZK6DrQXqdeFKULkXcPjnIU1y+DEyUHYujIdUJgbq/xgWAUEIK3uHO3e
+gDd6psc08hIg7TkXB9OPL1F1hChURaxuYPgexuxcsBr3Ou+U4/tLI4vgmjHM8nzY
+TcPHksJbQSqfCuBX1IRJzdc7iX+kaud2GWqxg2a0LZpZxMf3hasYGX1zDNkxMkr8
+cBf2hwu9oVSImH/gU6bfBHCIlLSRONi1A/K2TGQe8EYyEDL1GtCM7MUj7o7OIEqq
+pH2IibPXHQjFt/bh6iFpseZjS8HwUGZE04m5FZ+G3/ECFdq6DPkTxCV0rNasCLqM
+dKVQPsJl/M8pWrOrVoWpMiKErOVjZH+bH/XecJP/CtcrmEL7L4F6ZQaqoOxwOeBc
+pXsEfdaMBauoQpRsRxCHYcfebprR30bpOfxOlebbN7K8p/Pv/5SASY6ocuNtJElz
+cDQ/pxT7R6iEE+BbNH4h5CAEk4oc1AsXoBWdUUdY0hc5NHrnfuUDtzJDJfocG06B
+t46IXppa3QWGC8cJK8JWTjKr1xHrfGnrYPfg1f9DlqWPCro5HsClVvJfP3BIT+oz
+MeOVjaEeimJBpDBO7BR+52Ax1iqllPz8pSsX+Bik4ZLjBGVd2Dfp049m1QUEyHA4
+zaz+xs+bAgMBAAGjggJGMIICQjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQD
+AzARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGt
+IYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFFPwyjZagygVUiGYVVxy3+QI3TfSMB8GA1Ud
+IwQYMBaAFDEjMbZNNf9hivJNXA+Jny9LdmtGMBwGA1UdEQQVMBOCEWlkcDIucmZo
+LWtvZWxuLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3JmaC1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2EvcHViL2NybC9jYWNybC5jcmww
+gdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvcmZoLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBF
+BggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCjnjXKGnVP
+hd3Do1HsnPZTwRQ+SmrYoZOjT8rDtmCl1XWgcMMxkZrL7GZoBniBT0/D53LZj8l5
+/4DEH8BRDDEFk8lJxeW7STGC62Wq5KCzCDHzh/Tg3uapyn8+Spa/ozZ2tHVQNL5m
+W1hmLJHYykwITjVpUQRrQHMIterNiWVLPUiJW6lZaEmUPHlIM4hbb5b/4rxySrCk
+RSyaXcHkY/vFUfPyc77H5RnGnKi+PCoFzTEOMWPqfs5IrSe2qLYXmoY1xgFaZa8u
+WfCA0DKwsEbCD5XXjPzmUaAUSUf1iAEh16iZ8+QNLhyDq4dqjVaLYkFu1JlhKiU3
+mZ/qmmwB8wRz
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-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://idp2.rfh-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-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://idp2.rfh-koeln.de/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-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">rfh-koeln.de</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcTBUtv
+ZWxuMS4wLAYDVQQKEyVSaGVpbmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdH
+bWJIMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQDEwxSRkggS29lbG4g
+Q0ExHzAdBgkqhkiG9w0BCQEWEHBraUByZmgta29lbG4uZGUwHhcNMTUwNjI0MTMx
+ODEzWhcNMTgwOTIwMTMxODEzWjCBnzELMAkGA1UEBhMCREUxHDAaBgNVBAgME05v
+cmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcMBUtvZWxuMS4wLAYDVQQKDCVSaGVp
+bmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdHbWJIMRYwFAYDVQQLDA1SZWNo
+ZW56ZW50cnVtMRowGAYDVQQDDBFpZHAyLnJmaC1rb2Vsbi5kZTCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMd4FiJgA3//s13pX0vq13lLd+t91MCueeUI
+5Z+TAB7EaZK6DrQXqdeFKULkXcPjnIU1y+DEyUHYujIdUJgbq/xgWAUEIK3uHO3e
+gDd6psc08hIg7TkXB9OPL1F1hChURaxuYPgexuxcsBr3Ou+U4/tLI4vgmjHM8nzY
+TcPHksJbQSqfCuBX1IRJzdc7iX+kaud2GWqxg2a0LZpZxMf3hasYGX1zDNkxMkr8
+cBf2hwu9oVSImH/gU6bfBHCIlLSRONi1A/K2TGQe8EYyEDL1GtCM7MUj7o7OIEqq
+pH2IibPXHQjFt/bh6iFpseZjS8HwUGZE04m5FZ+G3/ECFdq6DPkTxCV0rNasCLqM
+dKVQPsJl/M8pWrOrVoWpMiKErOVjZH+bH/XecJP/CtcrmEL7L4F6ZQaqoOxwOeBc
+pXsEfdaMBauoQpRsRxCHYcfebprR30bpOfxOlebbN7K8p/Pv/5SASY6ocuNtJElz
+cDQ/pxT7R6iEE+BbNH4h5CAEk4oc1AsXoBWdUUdY0hc5NHrnfuUDtzJDJfocG06B
+t46IXppa3QWGC8cJK8JWTjKr1xHrfGnrYPfg1f9DlqWPCro5HsClVvJfP3BIT+oz
+MeOVjaEeimJBpDBO7BR+52Ax1iqllPz8pSsX+Bik4ZLjBGVd2Dfp049m1QUEyHA4
+zaz+xs+bAgMBAAGjggJGMIICQjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQD
+AzARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGt
+IYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFFPwyjZagygVUiGYVVxy3+QI3TfSMB8GA1Ud
+IwQYMBaAFDEjMbZNNf9hivJNXA+Jny9LdmtGMBwGA1UdEQQVMBOCEWlkcDIucmZo
+LWtvZWxuLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3JmaC1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2EvcHViL2NybC9jYWNybC5jcmww
+gdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvcmZoLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBF
+BggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCjnjXKGnVP
+hd3Do1HsnPZTwRQ+SmrYoZOjT8rDtmCl1XWgcMMxkZrL7GZoBniBT0/D53LZj8l5
+/4DEH8BRDDEFk8lJxeW7STGC62Wq5KCzCDHzh/Tg3uapyn8+Spa/ozZ2tHVQNL5m
+W1hmLJHYykwITjVpUQRrQHMIterNiWVLPUiJW6lZaEmUPHlIM4hbb5b/4rxySrCk
+RSyaXcHkY/vFUfPyc77H5RnGnKi+PCoFzTEOMWPqfs5IrSe2qLYXmoY1xgFaZa8u
+WfCA0DKwsEbCD5XXjPzmUaAUSUf1iAEh16iZ8+QNLhyDq4dqjVaLYkFu1JlhKiU3
+mZ/qmmwB8wRz
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e336</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e336</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.rfh-koeln.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.rfh-koeln.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Volker</md:GivenName>
+ <md:SurName>Beckhausen</md:SurName>
+ <md:EmailAddress>mailto:beckhausen@rfh-koeln.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>RZSERVICE</md:GivenName>
+ <md:SurName>RZSERVICE</md:SurName>
+ <md:EmailAddress>mailto:rzservice@rfh-koeln.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index f407ab0e..00000000
--- a/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://in-one-ear.oucs.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
- MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
- htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
- Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
- OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
- MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
- slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
- gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
- MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
- AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
- QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
- 3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
- PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
- YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
- RWKs9nPy5aZ19wn+/+Qpx//xnA==
- </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>
- MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
- MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
- htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
- Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
- OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
- MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
- slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
- gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
- MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
- AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
- QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
- 3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
- PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
- YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
- RWKs9nPy5aZ19wn+/+Qpx//xnA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Trying out Windows</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Nigel</GivenName>
- <SurName>Brown</SurName>
- <EmailAddress>mailto:nigel.brown@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Nigel</GivenName>
- <SurName>Brown</SurName>
- <EmailAddress>mailto:nigel.brown@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index adef02f5..00000000
--- a/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-dev.nsms.ox.ac.uk/shibboleth">
- <!--
- This is an "infodev-d7-dev.nsms.ox.ac.uk" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-09T15:11:50Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAMLR/aNeyl8BMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGluZm9kZXYtZDctZGV2Lm5zbXMub3guYWMudWswHhcNMTQxMjA0MTUxNDMz
- WhcNMjQxMjAxMTUxNDMzWjAnMSUwIwYDVQQDExxpbmZvZGV2LWQ3LWRldi5uc21z
- Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrcUBiNR
- en0REq0ls1dy4X7FFXjopOi88A/uLA7Dw6neTkl+HZ88gSgg5L3qsv+qZnqrzzLm
- ju8a5kfJPz9zvwAQFLA+ArD4wwrw8LLZf8hMbfF+pZEhCQMIGKC+cUbD+6YzQqvu
- geSFjhdl5X723IibxRPhmx14C4j+ERAW2tUQE09XQcZ6paIksRayzTObThK6GXf4
- BK9vtnXNDMvOOteHikyB8RqjZ0YezDlz8zIYQJeVP0d3tgp+cEHTyZmt1VgH2pe4
- jSA+PNX+uudU1z1AnZ/Asa0o0paRLmv6bnG2/XF2sRSkhEurddTq7QSN6xqIYWk7
- qZpH/reIrBSZRwIDAQABo0owSDAnBgNVHREEIDAeghxpbmZvZGV2LWQ3LWRldi5u
- c21zLm94LmFjLnVrMB0GA1UdDgQWBBS1Xk+0N4mnps4yNcemQMTTVWhw5TANBgkq
- hkiG9w0BAQUFAAOCAQEAHyhijXXcuc0YFMF0FmC5W4839/pyBORBU0/Nt/oX9/5v
- 6vByLWOaljvc/Vsf3+jhPK5FLassvHVKSZ2v4gJEjvkGMWlZTcpLlj0+yOHEvGlW
- t5HWAaypypQa9L6h2MsWIPO5mKuHMlLLgR4zXEL35MWQk6iuvsJKaCM6Uv8jyuQz
- LQVEEIK0Cf4SIHRPF7Vj8wLcGyN2pBOIevRjBeGGhfciBWWbsz+9h3eq610Cv/iU
- b/IynFccjjF7bx5iJyggB45pEIJQdhLOAuqR96crdrcVYtXYspErn+3gIvDi7sR5
- UbkffR0RAFrPzKRqjcDLdTTrTzzZ2gUqAfSNu/zXZg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="17"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="20"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="21"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="23"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="24"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="73"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="75"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="76"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="112"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="113"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="115"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="116"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="117"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="119"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="120"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-dev.nsms.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://infodev-d7-dev.nsms.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8dcfc8e8..00000000
--- a/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-live.nsms.ox.ac.uk/shibboleth">
- <!--
- This is an "infodev-d7-live.nsms.ox.ac.uk" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T11:16:59Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHjCCAgagAwIBAgIJAPb4uUizKWAPMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHWluZm9kZXYtZDctbGl2ZS5uc21zLm94LmFjLnVrMB4XDTE1MDExNjE2MjUw
- MFoXDTI1MDExMzE2MjUwMFowKDEmMCQGA1UEAxMdaW5mb2Rldi1kNy1saXZlLm5z
- bXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoyqIt
- i62chxgBpyHpAYgQPbFS6iKvOfv+5sgs+vWfc1VvKk1Bb3OqYXytZJw17y/IYyXS
- 0jG+M5CeS4MxxXW8j98pESvL1eYZH27FJhzOJLpITmoosQLT0nCQqJvGip1/6hhA
- yCpUaLkmvLJZOdanv6YDx1xc+89xUR5LqmV4Z+7xsLX8haEhlIHDhjVhOI7CDlkD
- JLUYEdix8VLZS9FPnrybrrHxYyfCSweBtxDHi8QEjxAoRU04q4BF4kLmQkH+vWN2
- Jr4akJz/fmIu00RdhyytFuED4S8lGHs/McYoRArdaWutaRj5t+xsppbcKjpCp6ru
- UPUqUjC9SQSBmDBLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWluZm9kZXYtZDctbGl2
- ZS5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBT2sRRg0Yfg28xAo5KMPC0EUeGUljAN
- BgkqhkiG9w0BAQUFAAOCAQEAY+NeJ6VjX51Oq+0YAArzeOxNEVm1vn2TIlzPC5sV
- V7/bCTixWP6q1dJNTpW0Lb39NfUwalzedpnVvP/+6DIPRZGVC2pGqO4WlY1ogh89
- hZuJIK4ATPVR9sXw+eKut5ZhtJgSQwrIs42FubQLKM4y4HJnh2mGRLoUYeBSNnla
- NrD2GHtfAwbxycQ1OqCY1qO6Sj2zV//ITElPv7Z3yLe9cFkEx7bt09fJ6JURo3cr
- jucD7A2vE9jV+4NdX4CgIWFyNbmRWP3dlBo3pUYtrKleXb7EUun6XxUz+cbK3LQl
- jfsceKH2qEFeCSuP5iMel4HC/c7ZnMeQnKSRmWnnQNwUmQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="12"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="13"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="15"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML/POST" index="16"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="17"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="19"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML/POST" index="20"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="21"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="23"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML/POST" index="24"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST" index="73"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/ECP" index="75"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML/POST" index="76"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="109"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="112"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="113"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="115"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.com/Shibboleth.sso/SAML/POST" index="116"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="117"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="119"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.net/Shibboleth.sso/SAML/POST" index="120"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="121"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="123"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.org/Shibboleth.sso/SAML/POST" index="124"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="125"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="126"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="127"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="128"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="129"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="130"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="131"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="132"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="133"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="135"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="136"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="137"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="138"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="139"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="140"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="141"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="142"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="143"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML/POST" index="144"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="145"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="147"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="148"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="149"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="150"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="151"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="152"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="153"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="154"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="155"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="156"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="157"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="159"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="160"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="161"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="162"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="163"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="164"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="165"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="167"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="168"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="169"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="171"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML/POST" index="172"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="173"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="174"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="175"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML/POST" index="176"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="177"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="178"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="179"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="180"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="181"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="183"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="184"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="185"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="186"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="187"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML/POST" index="188"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="189"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="191"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML/POST" index="192"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="193"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="194"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="195"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML/POST" index="196"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST" index="197"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="198"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/ECP" index="199"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML/POST" index="200"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="201"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="202"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="203"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML/POST" index="204"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="205"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="206"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="207"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML/POST" index="208"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="209"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="210"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="211"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML/POST" index="212"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="213"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="214"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="215"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="216"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="217"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="218"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="219"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML/POST" index="220"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="221"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="222"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="223"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML/POST" index="224"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="225"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="226"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="227"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML/POST" index="228"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="229"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="230"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="231"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML/POST" index="232"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="233"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="234"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="235"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML/POST" index="236"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="237"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="238"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="239"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML/POST" index="240"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="241"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="242"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="243"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML/POST" index="244"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="245"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="246"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="247"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="248"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-live.nsms.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://infodev-d7-live.nsms.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c492e87d..00000000
--- a/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-test.nsms.ox.ac.uk/shibboleth">
- <!--
- This is an "infodev-d7-test.nsms.ox.ac.uk" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T14:20:54Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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>
- MIIDHjCCAgagAwIBAgIJAL9xsW9eJb1AMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHWluZm9kZXYtZDctdGVzdC5uc21zLm94LmFjLnVrMB4XDTE0MDYyNTEzMTcy
- NFoXDTI0MDYyMjEzMTcyNFowKDEmMCQGA1UEAxMdaW5mb2Rldi1kNy10ZXN0Lm5z
- bXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuXn49
- I6qel9fSQqlzjbRwgaJxfu/JY6GsfuZkKZntJpdFsV9KOg1iNPA2uRwCUKZvCSBC
- 4zCErXIYJa6n0RLiupn5jAD/4e9SRUS3PpDIx2HngXOUTFV8pargq4hxJ0HCf04b
- +7qfyBqqzk6R090JX8BDCgqptBfCYAb0+IwV1nbCOT+ZUHdN6k9bXm9dqwLsoOMC
- aqezQMox0rdu703VEgQKBA9a0fvs/FXdxO1L6aGhPDeLo/Im+yhlWMNCu4Zd1JkH
- I6lmhRptDGEE1kZuJI/+yGhgK3RcObmljwZg47dS582V4zjkDdm9muvHWyL+YQVt
- CqZ2np34rhUkR6yLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWluZm9kZXYtZDctdGVz
- dC5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBS3TF9lwkGPgc/inGvcBU9lnhCfIDAN
- BgkqhkiG9w0BAQUFAAOCAQEAKvnTMZAof5tq+3Tm12XoiXAreXZ47HmZu0PdgFXX
- 3peHdYS6BfbsJFzYafpfzUzOegFavYDHMag0zZGaFjpeiWZEI7qO9quKMnIqO5Yc
- i5QfviShmcdtEp89zidPZi7UepHuG21GulbkX55jKu3rvbcvPXTdmP3gYRaR/xX2
- faifNN5e97ItMwkIH0ke5DiWsvQ/zXActH/BVBIku8R2gitOV/TG9eLUZtrmK7h1
- UNVfwntu6NfNjGx/LbCPVgVAJmhuH1YgTJbhDFfE9Ocu9CpxSlmhJXZu08kiPloJ
- xea684iW5WHGZB3KGh4Yslx4LE5VuYerU1NXuEUbzyPLlA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="17"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="20"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="21"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="23"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="24"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="73"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="75"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="76"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="112"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="113"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="115"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="116"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="117"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="119"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="120"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="121"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="123"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="124"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="125"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="126"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="127"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="128"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="129"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="130"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="131"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="132"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="133"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="135"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="136"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="137"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="138"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="139"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="140"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="141"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="142"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="143"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="144"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="145"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="147"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="148"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="149"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="150"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="151"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="152"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="153"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="154"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="155"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="156"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="157"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="159"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="160"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="161"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="162"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="163"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="164"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="165"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="167"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="168"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="169"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="171"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="172"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="173"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="174"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="175"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="176"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-test.nsms.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://infodev-d7-test.nsms.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml
deleted file mode 100644
index 9efd7ce8..00000000
--- a/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intarch.ac.uk/shibboleth">
- <!--
- This is a Shibboleth "Internet Archaeology" SP for the University of York.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-17T17:37:00Z">
- <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">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIETDCCAzSgAwIBAgIJANeltYZYTpEfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
- VQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEdMBsGA1UEChMU
- SW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNpdHkgb2YgWW9y
- azEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJARYWdG9ueS5h
- dXN0aW5AeW9yay5hYy51azAeFw0xMTExMjQxNTM1MjJaFw0yMTExMjExNTM1MjJa
- MIGmMQswCQYDVQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEd
- MBsGA1UEChMUSW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNp
- dHkgb2YgWW9yazEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJ
- ARYWdG9ueS5hdXN0aW5AeW9yay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAKtlAiwlls16Jrvc8GkLnMAufqCuUJpWkmNeBDkr2oumVYGXSwSC
- J0K53uu6vfS4cSSWw7V9sO+Bn7Y6DM5TlVnXmkdKY9nG1x5Qomyh6YXdph0hTjUK
- MV3UF0LR6k5PdGgKANikaorx9anM20BmfgC+tie38hi6D0rIijzLfAWmusQuTO7y
- obgkFfmxYU7TY9Wy5llocZ5f6xpbzPPmmdos+CR0b4ZJbvMprROzXH+SfiUDLVeO
- sd1XT8C2uz0ObeAVOVVixAZPdsgBhrw4lWaqdUKV7y2KJKscPbWaSx7puCgac+bg
- sfENrIhQOeqRx2YMFwu8i5OUyXrLPSM4HpUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
- BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
- VR0OBBYEFH+bs5MZtwpOLOsrRQ66dYcr7DknMB8GA1UdIwQYMBaAFH+bs5MZtwpO
- LOsrRQ66dYcr7DknMA0GCSqGSIb3DQEBBQUAA4IBAQAXCPGBG6YiQvzDdrEfYfbq
- xHN4bQTnUoXN8PDnC8lktGOqjbijIiV+Ql522TP7NSm74f59gEU0ADY7I/4BhduM
- WlDV+W3on0VIoktMWzcpyNy5VVzrf8qfuP4r2l9LPlPnyoYSPOf7pyI08BtgMqQJ
- gNQicUUX04v2A2Rr92YLwFqQGC43DICo0+IG6N9GD6czWOjEgxMSb+t/NMJkLvIZ
- Sgu0JlMLK1MlmSL3Lxn1TZbD/dkwzz9/+ke751F9WDRBQqA98rEoFYHmJ/KuKv6i
- 7hpWJ/uLvdYiGqAODCPZ76XQXMCSclWolY4WyBgIefP3bIncqOfsYaSe4skzsy0g
- </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>
- MIIETDCCAzSgAwIBAgIJANeltYZYTpEfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
- VQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEdMBsGA1UEChMU
- SW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNpdHkgb2YgWW9y
- azEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJARYWdG9ueS5h
- dXN0aW5AeW9yay5hYy51azAeFw0xMTExMjQxNTM1MjJaFw0yMTExMjExNTM1MjJa
- MIGmMQswCQYDVQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEd
- MBsGA1UEChMUSW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNp
- dHkgb2YgWW9yazEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJ
- ARYWdG9ueS5hdXN0aW5AeW9yay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAKtlAiwlls16Jrvc8GkLnMAufqCuUJpWkmNeBDkr2oumVYGXSwSC
- J0K53uu6vfS4cSSWw7V9sO+Bn7Y6DM5TlVnXmkdKY9nG1x5Qomyh6YXdph0hTjUK
- MV3UF0LR6k5PdGgKANikaorx9anM20BmfgC+tie38hi6D0rIijzLfAWmusQuTO7y
- obgkFfmxYU7TY9Wy5llocZ5f6xpbzPPmmdos+CR0b4ZJbvMprROzXH+SfiUDLVeO
- sd1XT8C2uz0ObeAVOVVixAZPdsgBhrw4lWaqdUKV7y2KJKscPbWaSx7puCgac+bg
- sfENrIhQOeqRx2YMFwu8i5OUyXrLPSM4HpUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
- BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
- VR0OBBYEFH+bs5MZtwpOLOsrRQ66dYcr7DknMB8GA1UdIwQYMBaAFH+bs5MZtwpO
- LOsrRQ66dYcr7DknMA0GCSqGSIb3DQEBBQUAA4IBAQAXCPGBG6YiQvzDdrEfYfbq
- xHN4bQTnUoXN8PDnC8lktGOqjbijIiV+Ql522TP7NSm74f59gEU0ADY7I/4BhduM
- WlDV+W3on0VIoktMWzcpyNy5VVzrf8qfuP4r2l9LPlPnyoYSPOf7pyI08BtgMqQJ
- gNQicUUX04v2A2Rr92YLwFqQGC43DICo0+IG6N9GD6czWOjEgxMSb+t/NMJkLvIZ
- Sgu0JlMLK1MlmSL3Lxn1TZbD/dkwzz9/+ke751F9WDRBQqA98rEoFYHmJ/KuKv6i
- 7hpWJ/uLvdYiGqAODCPZ76XQXMCSclWolY4WyBgIefP3bIncqOfsYaSe4skzsy0g
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intarch.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intarch.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of York</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of York: Internet Archaeology</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://intarch.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Judith</GivenName>
- <SurName>Winters</SurName>
- <EmailAddress>mailto:judith.winters@york.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Charno</SurName>
- <EmailAddress>mailto:michael.charno@york.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 74fd02e7..00000000
--- a/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth Balliol Intranet SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:53:04Z"/>
- </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://intranet.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAOwRlblp/LXWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWludHJhbmV0LmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTA2WhcN
- MjIwNDE1MjA1NTA2WjAkMSIwIAYDVQQDExlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwL6S+yOh34IjmsZs
- TrXKdS8/zYgSAvWJeY3UcN3rMyzWwQYuLdZUl05bWVgBW537kFwnIBcYhgOnKGt3
- RAJZozV56f6CSgPoZ4o2L88xEpKkoG6/o6N0Jkg29Ljxlm50NOtCb1UsV0BNFOXi
- y7zrVR2fF/MWTSySj0HulN8FhbhOFhlIV2FQOsSg/C2aZFtvNghQJfxSG69kDSXY
- LOwlCjEGGjnExfMW/sXvZdDR9hRRALQ6J1RMqTGegciqIp7g7brzKWbB+S+ki4ys
- rPQ/3SKoK7Iof9iK+MCyV7A2mNc/DbcdzvTsRSfBYb0jThNzmSpfhgcRq6BZCVPf
- H6sCXwIDAQABo0cwRTAkBgNVHREEHTAbghlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
- LnVrMB0GA1UdDgQWBBQ9zyb5zExfVTLeIqsAs7Q5I2aZTTANBgkqhkiG9w0BAQUF
- AAOCAQEAWjRkul6zFV8UhblhJk5sdrkODZb+vtp7UYQpn77tgDl8ELZxLdHqG3K0
- Xflyy9KNxBOg79k1sSveHVKrQ4J0VxBfXyIBZaJV3sal3v2Ck8nm6g/0NwdZRhV8
- yW+7rGDdzYDShpxhRnbHTZ/prlR1fT0pbUFgmqa7ea4DyoOOZndZI/glh0LLjH1W
- MRo3TPdgGytJBLS1Ii8Kgujc8zYy82yBtytw/iw6aqRFMK1jaVdDsDNW0fZY84C6
- 6EroyluFZnuwVFP5KuAz1NWnBKBqkboQyDgYhvIVQ9qYV3pykcWIyXzSCoixNyIE
- k4rhTMQ1dT+zT8nwSPUV6q5j1PQYPg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 91f92f6e..00000000
--- a/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.merton.ox.ac.uk/shibboleth">
- <!--
- This is a "Merton College Intranet" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-26T15:23:58Z">
- <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://intranet.merton.ox.ac.uk/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Oxford, Merton College Intranet</mdui:DisplayName>
- <mdui:Logo height="111" width="263">https://intranet.merton.ox.ac.uk/sites/intranet.merton.ox.ac.uk/themes/intranet_merton/logo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDPDCCAiSgAwIBAgIJAKQRJD1xnl84MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGludHJhbmV0Lm1lcnRvbi5veC5hYy51azAeFw0xMzA5MjMxMzIwMzlaFw0y
- MzA5MjExMzIwMzlaMCMxITAfBgNVBAMTGGludHJhbmV0Lm1lcnRvbi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJp0mSk8QaA3c+pVIhXH
- OqeLTK1d8dfufGu0fXb6mk3NEHlfh9kYV6Nil1S52S0OPpCoQpN9WqZoNxENwBKB
- izzkZAZkQsA1v64lX1uVbHK3wIF9JS0im1quoeeRO8RKuHhjpUKzeXlWnW3lMLnu
- 2ej8mmIkNfRKXuCSUUXJiz5KScTNyE/0PiPfcRxDWpacxwOfu9g85sKyFib1gx/5
- kQTGjABsts3PeAyg7SljCzA/U6J9ViLL19HttvHC+5NBu99amLA71JlR4zLp7W1v
- XzAJg0YiKDI6KtVVnEmQwcruWYK3+dGpbdzevqXPQl2rQIKep2MxQU7A5M4xNFbx
- WY0CAwEAAaNzMHEwUAYDVR0RBEkwR4IYaW50cmFuZXQubWVydG9uLm94LmFjLnVr
- hitodHRwczovL2ludHJhbmV0Lm1lcnRvbi5veC5hYy51ay9zaGliYm9sZXRoMB0G
- A1UdDgQWBBQPWqo8KVCpXpCs58z3yiZxZ7aEXDANBgkqhkiG9w0BAQUFAAOCAQEA
- N6g+njK3z8Em26gSbBPkb4IEbyvTfThDXOaQdut6Z483Vz5zVL1K+4VWVNTfD2wG
- n1s86viBwlcPJJpn5odC1qFKQ9vQUgG7d6ThYlkbD1HSMa3oHYcZ1InASsULyXjW
- uIn0LrsIj0VWZuRR1cn4yMJ39sFy6a+cF8ja3UlZasePp//1wk+/wuzV4jawCBKz
- /1hHqxpIN9q/vDF9YJV6Ymks3ZOEu7fhzg5UufviWDbAAUmnvGalqCKytCyWKD1i
- b3NJBlsPeMT6yUB7hAJFAejood7dtZsCUPn2IDv6f2bPORb1Y/KTI647jYeWY8T9
- U2c4+fv9MNj3M0Of+23vCw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Merton College Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://intranet.merton.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Cope</SurName>
- <EmailAddress>mailto:simon.cope@merton.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Steve</GivenName>
- <SurName>Bowdery</SurName>
- <EmailAddress>mailto:steve.bowdery@merton.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 0ba1d254..00000000
--- a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School Intranet" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:50:10Z"/>
- </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://intranet.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAIouVk51M2UYMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWludHJhbmV0LnNicy5veC5hYy51azAeFw0xMzAzMjAxMTI3MTlaFw0yMzAz
- MTgxMTI3MTlaMCAxHjAcBgNVBAMTFWludHJhbmV0LnNicy5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJSaQFswjc93gqeaMWkdXqZIm/2A
- 6WEVgInFCFHUPWLsPs/iiVhmDIOVNVPlqI85DqshRuocfPkwV7m/22J7b7tC1NnL
- ArnTdE3Btb+BqDwZaQfcXP/FzG5JaTef2ktLljY1tyue6cIRPsAkSE9lqkl1tTwe
- nugT9tu5hI2pio7lmN9NBx6Chxr6BDCLoYD+cRPy9lEcCpUenoIGNNg22xieE6Y2
- Nc+URn/J+sxhbyWwBxDgByrMcFsBPsMdOt5p2topnysc07+CgZdM7uiswYBz5Aj9
- qUeZF2gC+BtzaR/tOHyN8L57gzWOthH/e6hcS9l2CSE74o98gI0uEvX+GY0CAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuc2JzLm94LmFjLnVrMB0GA1UdDgQW
- BBS6ncz+YNbGJqBNWLnmu8GRL482ljANBgkqhkiG9w0BAQUFAAOCAQEAK/wwGRID
- V3WbBMsPSYWm9iH47V35BxxjTA45d6/lfbkFb4s5DD2FwD+wPubcri2s8cz289Kh
- h9j9yj0Y4msbvYOzioA2xvayntydLgwNjky1EqpnIn6Fv/Atpuq+rt8+CLYZQPHD
- vsmmQuZ7aORWFNPFIM1Ga51RurF2i83sKH5e6wYIWWx52d64DQfwa4rD9jrfurbW
- sS3dlTasQa1eAmqc8L/WbrFA7NAV8W0lvldrz/n/iljP9P/C1E4isf14+nQaBUlb
- PSLOQrLs+FvAmj0LpfNiX0FaipT5pKGuXV1Vmb7SKrEv9ecuOjMhpfcwfOoU2jWA
- EknFc192G29Now==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index f2eabcfd..00000000
--- a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.wadham.ox.ac.uk/shibboleth">
- <!--
- This is a "Wadham College Intranet" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-22T11:59:50Z">
- <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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAJUJ+mlkoDXOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51azAeFw0xMzExMTkxNjQ4MDdaFw0y
- MzExMTcxNjQ4MDdaMCMxITAfBgNVBAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1hB/bg6UfaT/XuBowU
- VPZMqkb8Po4FYgkF3hO52To/bqnCdsalOx/XLfZ4HA09I14q8f0D/cWCYEYtOnVr
- VY2hXOFO6YaRKWzQI8F2zHnAgkl9ytbWNqqIMQ6TINe96RCNV22ZZR/uOMQAiXwg
- yyxGiQNquo5+vMKhLITbnQTJ/h22K0/DzGH0YF0PvJc/nu/sZMww6FxcdwvEpfzT
- cK1WkSeqs4mHmrL1pi8VJTETFFZ8WGJZ2q8ueDloMFKfCa6S2fL2QuzXWbOpRDoW
- qC/GpTJDfY4Zi2sixl9dtPlzETR0eOcRtuocv9q+K3JcypWIuy7n4Kr7ZbHYSEn9
- DbkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW50cmFuZXQud2FkaGFtLm94LmFjLnVr
- MB0GA1UdDgQWBBRL8H7cVFCFP5rpqrBDxU4lUQ/0LDANBgkqhkiG9w0BAQUFAAOC
- AQEAOW8FQM1uFKk7chAErvTO0wiXvoVubVL0nqvA38zW1QNGFsJ9DjylIE7ijVvu
- ZhvN9mSMl5j3T1UM0wOBw+ChBCNhHMmCLtyZsTwGA2fnWR+HXCcZ98A45/+7JI84
- gdxPXpQMcNcP5VTP2scCQ5k4I2R2985N7NVU0DiqeMFeLqgAuwnuouv+RDioh5HA
- ZJlfdbEsApOe9P5VcHAMbIUIGMpLu369MEomRijiAf/R0VuF84TDX6UT3xzg18kx
- 94ZMLY2ekb/Sv1LxRNNJ/leILLJJxXJunf2rk1wYhUMoq2lRPSkrGVMMu/H5c9fe
- NCo2Q3oQaG5ZPA9VV7LCeIfm+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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Wadham College Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Lee</GivenName>
- <SurName>Wootton</SurName>
- <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Lee</GivenName>
- <SurName>Wootton</SurName>
- <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 57f2c56f..00000000
--- a/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet1.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 Balliol Intranet 1 SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T16:59:51Z"/>
- </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://intranet1.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJANtuMW21siCKMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmludHJhbmV0MS5iYWxsaW9sLm94LmFjLnVrMB4XDTEyMDIyMzE1MzU1OVoX
- DTIyMDIyMDE1MzU1OVowJTEjMCEGA1UEAxMaaW50cmFuZXQxLmJhbGxpb2wub3gu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXqpKnpB86sI2f
- YyXP5xx7UOIuKbes/RrYkncKSmMWE8uXd1yvRlcFaV9WESLV60t1ikFCKtruLGGY
- 6RAF6DQ/r4r+hRKxuAFswxjRmC4OOR5xGJnbrnso2OZXoj9rAJlAmi/4wNo3DOEe
- KSgBM3hARnv2JEVx4qL5cTypoWGMyD3WesCVG3KakHxDjs33/jBTeSe9NS+xpSSv
- LPGOWNHwBeOeMQX1YKnZOd/TXx6cKa3V4KS9P6tkTrYCWPydGw7mQ8aF5Bc4zr8T
- edj/6ZyIrKmGaKqlFev+tv/CdSRXVdSRGmNPVViffa3GbH1YKmyM1Xo305MlRYQD
- DofCRc2VAgMBAAGjSDBGMCUGA1UdEQQeMByCGmludHJhbmV0MS5iYWxsaW9sLm94
- LmFjLnVrMB0GA1UdDgQWBBSNpnZI8DCyHFQzH7BeHXu0mLJP4TANBgkqhkiG9w0B
- AQUFAAOCAQEAbeUAlzJ0gH6h2pPy+Nr2/n4AHqSwKkwhbwBCuRcKPwy1krCfnYL9
- Y5V49NjBhZeGAH/IHi07tR8u5c2dUQyRQw6T6uqJ427rWCtgXnL1QgHZXwXV+K7Q
- pBhdnwxYgbRRyXo/WMSCH3NRFeAxOFrY9HhA2XHbUfBBrjzAnT8YhaNK5Aadw12X
- 3Zo9jNZl9JZafaY0MPE5nRJMZa5eKXpwkjZqh5oJsPfx5lVxS9GkeR9Z/Y5h3ejN
- GtgjT6jUqydjKMm9CYdL/rijp53LywBZwuQwoABOwwG91MwjrbwXRaw9BcK05VaI
- LAXaNqQTfqwaHXaDqprLhpetEiURD1WEyg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Intranet 1</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fa680a15..00000000
--- a/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranetdev.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a "Balliol Intranet Dev" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-15T12:10:41Z">
- <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://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAI5vRYCws2FVMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGludHJhbmV0ZGV2LmJhbGxpb2wub3guYWMudWswHhcNMTQwMjI3MTMzNDA5
- WhcNMjQwMjI1MTMzNDA5WjAnMSUwIwYDVQQDExxpbnRyYW5ldGRldi5iYWxsaW9s
- Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtMyp0j7Q
- QH4qKNg/mYxxkTP5lRgV8pEl8vu9nl8LxE4faJpL8+QxAQoW7Yw88EFjBfcc5O/O
- hV31cOb3FlhBt30NDeoE7ik7wSmduVmeS5TUo+izAzjcdM109FGFkQMZ78bkefFC
- c3S5b6Axqd1JIzkm5n9z30q3h5LIWKCvWjlW5KXDeDyGXWxbzj3HnXexXJ9os8m2
- eDqr9TlKpLWU9zesJ5rXh0GU/CE33ryqRCx52sxBsZas8qevzmE9vfKi7YbqMD1+
- HUYZNK3PyNV4GQFa8avYHf7QNfATiAbz39QPY0JHIDOiPwgcmgiou+Jhxhcy7ZUX
- 4z0C4oJwUo3fdQIDAQABo0owSDAnBgNVHREEIDAeghxpbnRyYW5ldGRldi5iYWxs
- aW9sLm94LmFjLnVrMB0GA1UdDgQWBBQOQYNUMVsP1jC9dexfFq+RNkXwqjANBgkq
- hkiG9w0BAQUFAAOCAQEAkw8XWWT+TWzs62pcUR1uBmHFpJ0tf2WSwlnIo9Dr3Vj4
- x3yjAV3L3PWjOOMQ2hTGeaMhiAdpcA72tgcrwcRkFcucDahpCAKo7BP452nem4sf
- y64vJrMFgh0sRH5XAIKhygLhm/A5gDU7rUI/QKaxgKut3ODMoy55YTWQq5u6J/ul
- JxlRyjtfdq0hjkIbKTMa5YSd8FBH8ymgQuVKdA3FuGfAjbrtCgmYDdb7HGFKxnQ7
- hfD6/CA/f85GY7EYDdnji9q+RnLnkfGPqwh0p3kJXOA245d3zlLF1uOud8XK2vvR
- fjCDcSlVMXyh2hrW1XKa208JjXg3T5XCg7kENrTk1w==
- </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://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Intranet Dev</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Balliol Computing</GivenName>
- <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Balliol Computing</GivenName>
- <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
deleted file mode 100644
index 626f858d..00000000
--- a/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-aai-logon.unibas.ch/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-05-29T15:26:46Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor 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">unibas.ch</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">Universität Basel [DO NOT USE YET]</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Basel [DO NOT USE YET]</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fr">Université de Bâle [DO NOT USE YET]</mdui:DisplayName>
- <mdui:Description xml:lang="de">Universität Basel</mdui:Description>
- <mdui:Description xml:lang="en">University of Basel</mdui:Description>
- <mdui:Description xml:lang="fr">Université de Bâle</mdui:Description>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAgklEQVQ4EbVRQQ6AMAib/o/X8kANi90KG3GJ0wu0tJTMUv74ROSKe2ecaU4IMwHmXFMtBly5tyXAvND1JpiJMv5Y2uoiOlDV6u/M08W0iAcDCJzOlXvTAcPT/gKILdVSOCliDtn/iFlaxvM17YFwPpuYcyYACAxzvzqHrta3BU78Fdzl9FuPpzdbqAAAAABJRU5ErkJggg==</mdui:Logo>
- <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAfHSURBVHic7JvZTxVJFIf9n3zz2QffTFzBLSoxikiURFkcFBUUInpBFgUVVHAB9QIuIJlxA69xQUSGxRVUXABFVBQVQXu+3IqVovt2D/FWDeNynrqq6zb1dZ0653e6mwnWL2YTTP+Bpqam9PT0sYzMycm5cOGC4emYB25sbNywYcNYRm7fvv3s2bOm5/NfAG/cuHEsI38Y4FevXj148MDtrAp89+7dt2/fqmc/fPjQ3t4ujr2BHz9+3NvbG/5sNQA/e/YsMjKyoaEh5FkVuKamZvHixQMDA6L56dOnmJiY8vJy0fQA5qZERER0dHSEP1s9Lt3Z2Tlr1qzr1687T9lc+vjx41FRUf39/e/fv1+xYsW+ffvkKTdgaLl4W1ublqlq28MPHz4MyezcwzAfPnz4xIkT+/fvV/tDAuultfQGrZDMTuChoaHW1tbbt2+zyGq/ExjOmTNnyk2uxTRHaSezDZgotXTp0tOnT1+8eHHRokVv3ryRp2zA0OpdW2H605JgvnbtmmiqwNBGR0cfPHhQNKuqqlRmFVjQ6l1bYUby8KNHjySzBLbRChPMIldJYBxeuydLMyU8BDO0zB5g9i20paWlzpGVlZUwDw4O+ny++vp6crU5Wsuo0nr+/PnChQsPHDgASWJi4tGjR91Gkp/j4uJyc3OLi4tJ1FryrZt9PzBL8ZenUQmwpIFA4MWLF4WFhefPn//TxRhZUFDADcIjyMw0va987ty5cQBmWuw6n7tlZWXt2LEDTTI8PAw5xZDbSIaxtggvmFnn7Oxsj8uK8eMAPBZLSEjIz88HBgnZ0tLiNoybsnz5cobt2rVr5cqV3CBzUzIF/PHjRxiOHDkC56ZNm9Dbaq5SjajGKfYtHkHQIkXLuG3CNACzPkQmtUfQik6ZlkTctukwkYFQXZaSlioqKghdNuaysjItIkQDMAk2Pj6ejSeaKq01WnjYdJhKa40WHoJZ1lVFRUVUGlqWXY9Lf/nyhe0KM7IJWrUqsElLwXzjxg0yrS3f2qSl3++HmbqKvQ0tIU3LVLXt4a9fv546der+/fukGbXfWTxQytfV1V29evXevXtqv7N4QG+T/Ljs58+fdc1TGzCezMLeuXOH0k/tdwI3NzefOXOGrAaz2u8EppBk35aUlGiMYXqA2cbLli1jZhysXbuWqctTNuBbt27h0qxbV1fX7NmzL1++LE/ZgNEqq1atQnKyn1Fsal0VjmkA5vZDK6sCfBtm5IFoqsCCFrcXzSdPnkREREhmFXj37t3QSk+mxoD55cuX4c9WAzBrhRhWe4hhkvnmzZsCWNDa9q3KLIFttMJQlPJOhWOmhAfMSUlJ6MSmpiaAxZMaG60wmPFt4jY3iChFPkNsaYxSNjMrLdPS0vLy8tBbsbGxgLkN6+vrI/EQ7SghkpOTjU7p+4Grq6vx2z88LT09vaenh8GHDh1KSUlJdrH169eLx5evX7/OzMykx/uy69atGwdg5DHbstndyCisLRkIUUmphK7628VweJwfhydXkdv4ocdlMX4yDsD/asx7wYIF5eXlGRkZqampILmNZHnZ8BQPeDWVQ8gaQ5eZAhYxmRqI1RAv09CeIDlH7tmzhx0+MjJClL506VJ3dzcxLBAIGJqYEWA1AzU0NAhgqbfVkXv37oV2aGiI423btolHGU+fPiVXGWLWD2xTFxLYCjKrdZVKaynAlklmzcA2Wms0sPWNGZFcW1tLKpK01mhgK8iMb+PkemeoE9hJazmAhaGlGWZTFzZg69s662XWBoyictJaoYBRF6WlpZWVlWqNYYUCtgww6wFGMIektRzA0KKTqSWHh4eREEDKUyGBrW/M9fX1WqaqAZiCfu7cuW7KXgX2+/2qThZ1lXwY5AZsBZnnzZsnHwaFYxqABwYGPAo3FRhxpkYpjPQLjDj2AMb6+/sRnuHP1vhHLSGDVkjzBtZlxoHRiezVsYyk0rA9DzNhxoF7e3vHqI2JfB4lpC4zDvx/s9/AP7v9BtZtVAtCaSAzpORAZolXJ5yVL0c5oGl6PsaB29vbV69ebQULBnFgBR9xTJw4saur68qVKxSJojMtLY2m6fkYBybZREZGctDS0oIkFp1ZWVnTpk1LTU2tq6vLyMgQnVSLP8bXtN7W2Ng4f/58DlDCEnjr1q3Hjh2jiZCWNRMy+2dQWpQWU6dO7e7uLisrA0l04r2wFRYWTpo0SX6wER0d/TMoLSv4lgRCpLL84BkwFvzdu3eJiYmyBqqoqNDyMsXbjAAPDg4iEm3FDVGaMljt6ezslN+XErQpuXp6ehhmBV9H2gbrMiPAmzdvjo+PX7NmjfxqnNlTMy9ZskSOKSgoYM1PnjwpCNnSM2bMKC4uFlmKs+qn1BrNCHBCQkJtbW1ubm51dbXoqampwavnzJkj/1mAgj4vL0/+BLzY2FhcWvATyfLz803MzQhwUlJSVVVVVFSU3+8XPawtPJMnT87JyRE94oV4TEyMICwpKZk+fTq/EtrD5/OxyCbmZgQYgUG+KSoqEqV/R0cH/swWRVdMmTIFvQUVsaqtrQ3IkZERK/iMOi4ujp0vmpmZmVTR/FC79jICjCenpKTALL7NIBUTqMWpnTt39vX1cZCdna1+xYM+4TZt2bKF0E0zEAjQZJ21vyj+5YqHfwAAAP//AwAvb8SJSpHFqAAAAABJRU5ErkJggg==</mdui:Logo>
- <mdui:InformationURL xml:lang="en">http://www.unibas.ch/de/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="de">http://www.unibas.ch/en/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="fr">http://www.unibas.ch</mdui:InformationURL>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
- <mdui:IPHint>192.43.192.0/22</mdui:IPHint>
- <mdui:IPHint>2001:620:200::/48</mdui:IPHint>
- <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
- <mdui:IPHint>195.176.29.0/25</mdui:IPHint>
- <mdui:IPHint>193.8.136.0/23</mdui:IPHint>
- <mdui:IPHint>131.152.0.0/16</mdui:IPHint>
- <mdui:IPHint>131.152.188.64/26</mdui:IPHint>
- <mdui:IPHint>131.152.193.0/24</mdui:IPHint>
- <mdui:IPHint>131.152.194.0/23</mdui:IPHint>
- <mdui:IPHint>131.152.227.192/29</mdui:IPHint>
- <mdui:IPHint>131.152.227.200/30</mdui:IPHint>
- <mdui:IPHint>131.152.227.204/31</mdui:IPHint>
- <mdui:IPHint>131.152.227.206/32</mdui:IPHint>
- <mdui:DomainHint>unibas.ch</mdui:DomainHint>
- <mdui:GeolocationHint>geo:47.55898,7.58352</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
-MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
-LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
-HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
-uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
-ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
-WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
-dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
-O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
-lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
-gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
-t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
-K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
-xVM3RvYuoZFN8VKpoMHa6A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://its-aai-logon.unibas.ch/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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>
-MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
-MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
-LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
-HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
-uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
-ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
-WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
-dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
-O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
-lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
-gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
-t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
-K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
-xVM3RvYuoZFN8VKpoMHa6A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="de">Universität Basel [DO NOT USE YET]</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Basel [DO NOT USE YET]</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="fr">Université de Bâle [DO NOT USE YET]</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
- <md:GivenName>URZ</md:GivenName>
- <md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>mailto:support-urz@unibas.ch</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Arsene</md:GivenName>
- <md:SurName>Gschwind</md:SurName>
- <md:EmailAddress>mailto:arsene.gschwind@unibas.ch</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e9b4dec3..00000000
--- a/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcrmail.new.ox.ac.uk/shibboleth">
- <!--
- This is a 'New College JCR Mail service' Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-05T16:23:42Z">
- <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://jcrmail.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLDCCAhSgAwIBAgIJAML2ZGVSnH6fMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGpjcm1haWwubmV3Lm94LmFjLnVrMB4XDTEzMTEwMzIyMDMyM1oXDTIzMTEw
- MTIyMDMyM1owHzEdMBsGA1UEAxMUamNybWFpbC5uZXcub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiH44HVc7zwdznUT53Ufb/uHtkUSKH
- vhNV0gxzxtABgh2RTyiOj8nqvc7fAPvalplfGDCeIEM+GgibAb61Ue3Zg3uPp+Qo
- 1M2bc1aoEi9ox8M9xvvnCfOlJl8bnSOk/RaExmiu+5tVZHL7+BazhzrwQFWt2me9
- V7iUJ95Q3mSU1sPGCu4LXL7lbruFwFgUr2H8mB9lIxb2DHa/gHN2V+0Kv7pzUsV5
- iEZCwhhwVKUU5UEIRWoeUOyaOyp8rkk50aS34bLW36PzrEbsrYoXF4/PQMN5EP2S
- Dy1ov1ixqp/k9Gg5PEamucgFxk/QBefkQ+mxPkqxTzgK+ISeKsCdE+sdAgMBAAGj
- azBpMEgGA1UdEQRBMD+CFGpjcm1haWwubmV3Lm94LmFjLnVrhidodHRwczovL2pj
- cm1haWwubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFHR95FV4l+sE
- 8+nH5oH2kTRP3/t7MA0GCSqGSIb3DQEBBQUAA4IBAQBHEM8J5uExzSroMin/n6oI
- EsSttlp2u4TtBmpC3TAYtMA3owuRM9fv4FnLSrZB91SMep6t0oR6jlh6VrKkn2zA
- /G0hmfyK/DZGfJ/NZTNFB6lF0PrwKDX2qmhQgnL5/i8maXS2vRt9GrLiu6UzQTAI
- +KjNdtR5fYAgw6tW/Np+gCA4As0BzxTpkV588Y4xjm7GpJL2GI8YfOajVWP2TbJj
- rWSav486oZmP/J9mHTY5hq1nBQg5BBvDfZfRUEc1bHmLUUnkWs/N/pQ7ZGTtDzBT
- SdLjFqV63m+3naMFk5mGsDJ3Yq4gTPUfmPETdxdYN89CIxT7pJrqTDBXpqSZgMkc
- </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://jcrmail.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR Mail service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Officer</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Officer</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d26e1ab4..00000000
--- a/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcrold.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College JCR old website" Shibboleth SP for the University of Oxford
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-28T11:49:51Z">
- <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://jcrold.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDKDCCAhCgAwIBAgIJAOCZ0GCvpLO7MA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
- BAMTE2pjcm9sZC5uZXcub3guYWMudWswHhcNMTUwMTIyMTU1NzE2WhcNMjUwMTE5
- MTU1NzE2WjAeMRwwGgYDVQQDExNqY3JvbGQubmV3Lm94LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkz2ksPpFpDVR2F9qvKhey+uyifIUkf47
- IkTpFript8sNAvVDxxaNnmqNRBOUQvVINbV6K7l/qPPf3pA8WzZRB5ZpRmvTIyay
- O10XlLJQzqS/2xgXB4uXQA03GFTtqnA7rnFzYJmXPMyWj4qtvDe322azmZfCIXAf
- H5gpekdH2tGeUPxG6d2ewyjqqVyI7wk8XF5GRThC0wf501BAQ6252A6RqoV7x6UW
- OrEkxdCjoxmg6aZ2ArFvAEQrtq5NobfWs7UiFvH9U3/uWCXRKowE5it+u9uuiytS
- nFIsuQod/sqOInFMgK2QJT+meBcKjlYWDn4zNuFAH55CLvPyeI7yOwIDAQABo2kw
- ZzBGBgNVHREEPzA9ghNqY3JvbGQubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcm9s
- ZC5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUmD8DElMxF75BJXhy
- epLcwStYFz4wDQYJKoZIhvcNAQENBQADggEBAGLKFMmZHsWvbeAtTPCF6gT0p+/I
- Oa2Pl7MWsHLWMWHAnSzQAvPv8InACCX3m3W9v+30L5jmgW3tWMkdJjDvlUOv0Rvd
- +oGWe/ixJzbmpxX1QZNi1HE1IEvu8s32aoBvmqFOJ1w1K2tIA8EzSWssi5NI5rvZ
- A5XTIuUmVl/Uo83t//t+LferDHvcc2rHBhxvItHx4fTMFjVOHgbTZMB4mXD+SoBc
- zXSvW3Gq5gD44CbBJWMOayTQthbG//wFxnVUbViJp5VSwfr5Lok+neOEwJvPTSO9
- 08W9A9x0ao2q/PABpXt+L60pvnWkWgjpmErt5XPyIKeq0XmaSX30YEMd4TE=
- </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://jcrold.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR old website</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://jcr.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>JCR IT Officer</GivenName>
- <EmailAddress>mailto:it@jcr.new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>JCR IT Officer</GivenName>
- <EmailAddress>mailto:it@jcr.new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index cd8491bb..00000000
--- a/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcrtest.new.ox.ac.uk/shibboleth">
- <!--
- This is a 'New College JCR development systems' Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-06T10:25:46Z">
- <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://jcrtest.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLDCCAhSgAwIBAgIJAOjOE9gl5zabMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGpjcnRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMTEwMzIxNTk0N1oXDTIzMTEw
- MTIxNTk0N1owHzEdMBsGA1UEAxMUamNydGVzdC5uZXcub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8UTciDnh59ywOKTwTmbkZNTYgI1Mz
- NxF73zZDbKfujWGl1WHTH7xdajdPtYaIYmXSjGgn2nt7IUZqJLEbSgxkyXpivTUe
- FZcmWWxOghoKHU68YjsgbxKaHldfav0c7LnjTtOzU1yxVX+v2TRNVULTHRBZwVKO
- 8R4GcshmpIW5fLr53UeofuMdOJgTe8Ra90SEUGONBCoeKqwf1gXCy4UFb8B2NoAn
- NNaiFSOSIqxXva349XU8bYZZNT57kbIa+4tsAzGvQAY0ZvqUpVKezxKbvuP9r+qF
- MM/x4Y1rx+YKLLebzFP3vwAtW0Jdw1Cgi0A2ov5XtHmHyHEHrGuIkDPpAgMBAAGj
- azBpMEgGA1UdEQRBMD+CFGpjcnRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2pj
- cnRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFN7qW3yVIa1C
- sZTAQ3GbBz/xAXn0MA0GCSqGSIb3DQEBBQUAA4IBAQCDldZnrvi53hsFku7A3STF
- mdO+I9YZpwAsT1DvabRgXAakSrgU1KUGBQ0FZJ0/mk9AbSTkgksXAKdmfQs6mJ5+
- bsC2Tlp773NigTWYvPjGeNtSyRa43SXBVMaaA+19f9CVCElBMpp+WXk9i/s4krK/
- l4EtgbrADwp+fX56e6OJQHMdYEr5zLV9whvi6erQRIVjY6GfHOJgcG0xazSL94AJ
- jg6rthw7nWMxfGy5g2m7bR5K9C9hks5la20hBYOduowvjuGDKEentOVJ04RdZ0Ju
- A4sEXh+cYpGgb/I6uHjcoawS2Dzya/8X0VeiH6UcwvGot5WuSMDg/DSUEUK5b1KJ
- </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://jcrtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR development systems</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Officer</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Officer</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 197cb772..00000000
--- a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.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://jcrweb.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College JCR" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-18T10:02:09Z">
- <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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDKDCCAhCgAwIBAgIJAM+jRUVpcaogMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE2pjcndlYi5uZXcub3guYWMudWswHhcNMTMxMDExMjEyMDIwWhcNMjMxMDA5
- MjEyMDIwWjAeMRwwGgYDVQQDExNqY3J3ZWIubmV3Lm94LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RatgWIQ0tgieur/TZdJMa+J7+Qm3D+y
- 1oev1jnx1mgLo/dzafOHFhoJZ3AqLUNJAIbJPNlIhJpGEViwpJnBIlukULWKtF9x
- UxH/vQvkQhMWxox1bHO4heWt4QmHcBM0vVi84MoobVjHKHk4/IFBg4cD9P8URObR
- uKhZ5a7UPlOk5+RYN7vP5PjazNzHW3IX68ta3BL2RG4Eni4TGFCuUg9tUVeNFUVN
- y9JnYcLSRrNOF1ND9XX9p/SjFDV9WvjbWsgyUrTVPTvXSzgYZI58r01WSrE7tz9f
- dvbOP6KMEgI6JONlYflpA0Cb+QyYqBA4ZFYNsqb2yhg4ZltCwOZDiwIDAQABo2kw
- ZzBGBgNVHREEPzA9ghNqY3J3ZWIubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcndl
- Yi5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUq8M4jctknnDLTc81
- iYJG2rgDVYQwDQYJKoZIhvcNAQEFBQADggEBAKmylrHk0WDPwoHAy1KXqQbySSyF
- LYHyEAWxVceWoY5AozLFysUu0MpllDbZcUTBMs+TzLVpq8PUdrj3A87IVB7WhIzw
- uwBi61ZmPvMiE43s/5HZJG0ibf48q0ZS7h1cVsUOFaJGYattJUvvfRu0GgtMyjJi
- /msRlm6B8YkO95AZc9BsxfnuPYn0LRzQyt1T8pObH/oNUsCcvybXJTHG93oE7mRd
- hryZmf6zRTaMrw9KT6SvQf2Let/RJHv8OK3juH8kw6iraOSc+cK0Ea2rCWJYNWS0
- aHp4plsboCSy3YDvkk573vE1IbHvoT86Qg9cIOVoUOd1BE8uxQhXOVg/WDM=
- </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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://jcr.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jakub</GivenName>
- <SurName>Warmuz</SurName>
- <EmailAddress>mailto:jakub.warmuz@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 8f183244..00000000
--- a/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ku-primo-prod.hosted.exlibrisgroup.com/shib">
- <!--
- This is an "Ex Libris: ASP Service on behalf of the Kingston University" Shibboleth SP for Ex Libris (UK) Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-04T11:22:00Z">
- <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://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNjCCAh6gAwIBAgIJAKw/r3u7k/vAMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
- BAMTJWRjMDF2ZzAwMzlldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
- NjI5MTM1NTE5WhcNMjEwNjI2MTM1NTE5WjAwMS4wLAYDVQQDEyVkYzAxdmcwMDM5
- ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEA87/H7BfMefIzd78V/qDhPXBb2XQkICooMjJDekUKaKdykC2r
- oPp20O/k3XdMvWjJe9bgCURkzcGLoAB8+8YJG5j6ACMfTpcV32q4gIfXk8PlNSBt
- KjAjJW/EqaN1p8Q0BaMZfcWoNaOhhLWgBkiHIwuCkinsqy0RBy28NBVv9QWnC2PG
- iJkRAZtXx8RmHDXu9EP/xnQI2a21i4VrbUbG0wvt/h2yYeQ3c1SGQUfdRxFXktTS
- B5zkt1fKE4K0vJStL/anr6RJpFFiBfLxE9oy1B+HcINrZhwtv37OM9bsfOVL+UFm
- zZYUjMnpEMzJXY7L8iyCPUElOzO+GafGuwqYNwIDAQABo1MwUTAwBgNVHREEKTAn
- giVkYzAxdmcwMDM5ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
- BBT5akq8gSoJTPqBY/a0JeGDONIu4TANBgkqhkiG9w0BAQUFAAOCAQEAEmFX5dmF
- aHlpAY9j87joM+fWjqQVEwKiw2qYVaWYZmJwyGd6GTTS6zbiiqtxdUovv2lGEBoa
- VL7D/Mbrp+uzy6eyJErd8k3JQ754BH2cSgklWKJcO4WRjnlGSGrC5BzlcdweLIwz
- vjuFU3fkSBXs9nytRd4E/+NTht9U5cJTFFxs9A5OCdY4eXXqU0WleM2hDHgyAB46
- 77eCEE6qd9aFGsoeujg81dSL9J+yCorax8K6BVMi4xPOG5Jp1JXIM1oOJZHoXz0w
- pauro8vi+P0JtAcliUP2Gs8Vg54ROeafsweovJoRVdgEpdGW1FOPlDk07IM0/4Cl
- /f5ttpDEx/6kcw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Ex Libris: ASP Service on behalf of the Kingston University</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Frank</GivenName>
- <SurName>Bieber</SurName>
- <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Frank</GivenName>
- <SurName>Bieber</SurName>
- <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4fe87fbd..00000000
--- a/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leeds.wadham.ox.ac.uk/shibboleth">
- <!--
- This is a "Wadham College NAC" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-09-04T14:59:30Z">
- <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://leeds.wadham.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJALdAFtXAAI1PMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWxlZWRzLndhZGhhbS5veC5hYy51azAeFw0xMzA5MDQxMDIwNTBaFw0yMzA5
- MDIxMDIwNTBaMCAxHjAcBgNVBAMTFWxlZWRzLndhZGhhbS5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcYhEqzgTzrAvZbgM5mFhntNkh7
- gEh1HCO3ryI/YihGdH8ZblvfyuZU1mgaogarprLdOK0snmWos8DaX2yjFnh7Wtou
- UjT0OWVzj9KeVUbWZzLMmTBYe89fdS6LVb8zMhW0/axUGzHnnc5cnlLqJqT+K/AA
- 2Gs0Etkn+SZRiKmevQ7O0oRBrz/Pmm5trvGnb709n751lPOmf/S0acJy2EbKch9b
- fPGffhRLhQMuZ3fir5+Q6uWeQbfqrELFJjSFeo4HKKoETZNnECZCjtLfDirtfaE+
- 2p4vWnOAMQC5/veZ+zSJur3nMCpeNNTHgXriwbuwh5fUF1t544laEQdQTKMCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbGVlZHMud2FkaGFtLm94LmFjLnVrMB0GA1UdDgQW
- BBRcBV5eDW2Ctx+PdpiRbP/kukLo0jANBgkqhkiG9w0BAQUFAAOCAQEAwhOZbxZI
- Z7AFmVFFVXZJ7ad9NOl0/QnSXyTgwhoPDx87MCNGkmKVy8s7wQqJ+YlJDMveVWgF
- +youH53RrrEbXoNpDMfNchapK4Wek9jf85DxYZyGzJGngzG3LBhhEc/SVUoGr6vo
- Rm6rMPmFL1ALyLXGZqRLsSDhdFAwuYhSMGKcQm/YIVDEu4dqmeQm7QIoM6dgzj2G
- /z+frfonKNwjPK3btmrQsxsL8EcBcct9xXv2wdOL7opOcKewckJjt/JvA6LcMeNq
- abMDiWvBUb2X096WTJgy3KGVjlDLOAYi2b7DnBiNdqK6aKsYxIYawphCfA4BRGeW
- /7J4oftolmp18g==
- </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://leeds.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Wadham College NAC</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Lee</GivenName>
- <SurName>Wootton</SurName>
- <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Lee</GivenName>
- <SurName>Wootton</SurName>
- <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</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
index 5fe6ff69..5d550df8 100644
--- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
@@ -91,8 +91,8 @@
<EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Jeremy</GivenName>
- <SurName>Grayson</SurName>
- <EmailAddress>mailto:J.Grayson@leedstrinity.ac.uk</EmailAddress>
+ <GivenName>David</GivenName>
+ <SurName>Baron</SurName>
+ <EmailAddress>mailto:D.Baron@leedstrinity.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
index c00636e0..7467591c 100644
--- a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
@@ -84,6 +84,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu-morh.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope>
@@ -186,7 +187,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcs.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/login.justis.com.xml b/swamid-interfederations-2.0/login.justis.com.xml
index 0b73196d..48ab6177 100644
--- a/swamid-interfederations-2.0/login.justis.com.xml
+++ b/swamid-interfederations-2.0/login.justis.com.xml
@@ -6,8 +6,8 @@
<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">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
@@ -37,9 +37,12 @@
</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://login.justis.com/shibboleth/post" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/shibboleth/artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/oa/auth/rcv/shib/post" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/oa/auth/rcv/shib/art" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.justis.com/oa/auth/rcv/saml2/post" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signin.justis.com/oa/auth/rcv/saml2/art" index="6"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Justis Publishing Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..7625e144
--- /dev/null
+++ b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.restena.lu/simplesamlphp/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RESTENA Users</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">RESTENA Utilisateurs</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="de">RESTENA Benutzer</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="lb">RESTENA Useren</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for end users with an account at RESTENA Foundation</mdui:Description>
+ <mdui:Description xml:lang="fr">Fournisseur d'Identité pour utilisateurs avec un compte de la Fondation RESTENA</mdui:Description>
+ <mdui:Description xml:lang="de">Identitätsprovider für Nutzer mit einem Benutzerkonto bei der Stiftung RESTENA</mdui:Description>
+ <mdui:Keywords xml:lang="en">RESTENA user users login education</mdui:Keywords>
+ <mdui:Logo width="78" height="100" xml:lang="en">http://login.restena.lu/restena.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
+ <mdui:DomainHint>education.lu</mdui:DomainHint>
+ <mdui:DomainHint>lu</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:49.50,6.00</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIG8TCCBNmgAwIBAgIJALmfaVOnBptMMA0GCSqGSIb3DQEBDQUAMIGPMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MS0wKwYDVQQDDCRSRVNURU5BIFNBTUwgRW50aXR5IGxvZ2luLnJlc3RlbmEubHUwIBcNMTUwNzA2MDcyMDM1WhgPMjA1NjA3MzAwNzIwMzVaMIGPMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MS0wKwYDVQQDDCRSRVNURU5BIFNBTUwgRW50aXR5IGxvZ2luLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDAvzTExPqK7hRWD3/KyRJilXTCD/obJd4XGZjwhjbnMVcyO48ll4fl7tPhNxnqNwDq/KrFbumoUCEROdwbvu2sdJQ27sG0I+2if0jesN2KD/yX+3Wsg9msTI1tPicxueBjd/mx/nYQGY24s9w+eLboxGr4WPCIV87PHKo447jV1oPkw3QL+2yD9XawrYVlxwf9ociTiz1VEgtdNonmq+a1giFSahrelKzkE/FsIEp1olWxDvIAc/LUcPfc0w3c8BX+OMHX3puyONeoShbJBMb34Rksd20mrmm0HiAINNFImwmvnav+hqX4M+2D1rxRmfQnKyKvIJ+RBh44ltpEqEN4YNgelGAcWjdyn6SpbXXcAqIHo4uFDVtDYosVl73HUpy6sme9MxgwLPvTymjMz5qzJOPRDVCGv6m8BmQzDRwZwnCnaxBjjNFzddV0WK/qgq2/UMnNYoVkDLWZJ3mOSWUborbDKaOnlRG5wtdQBL8lld4Ny57hZZyAmYo9NgsSkuUt6k5+2ckV+uzjw9nZx/WLUpxeO9cl46zxoVSRBTD2KJT/HLrwSgPGn9Ua34eZ7us0lHCYef/alosShx4/HDsZR5uUpYuCVtRgJaXJPQdusrkomXlVBYA9hHTBrcbFengzuZAvH1/SbcpdtAiyh3LrQI46zBU/rgMcL6dVB5nv3QIDAQABo4IBSjCCAUYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDSwQy/FZJsLCbdeJGzYLZ5cW+Y/MIHEBgNVHSMEgbwwgbmAFDSwQy/FZJsLCbdeJGzYLZ5cW+Y/oYGVpIGSMIGPMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MS0wKwYDVQQDDCRSRVNURU5BIFNBTUwgRW50aXR5IGxvZ2luLnJlc3RlbmEubHWCCQC5n2lTpwabTDAJBgNVHRMEAjAAMD4GA1UdHwQ3MDUwM6AxoC+GLWh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9sb2dpbi5yZXN0ZW5hLmx1LmNybDANBgkqhkiG9w0BAQ0FAAOCAgEAPi115CKvlp8TaP0AnD7q3PLvIFrTdw5AL7K02k3m2AY9WfoBL+LfyNfPJw/EItrzcgZhy4lEr1oKSX3q+ECFwAHDE06lgQytHkNnE9tUbnOHl3RsimF+J+pndyHVN3gh3pbUUvlvP2XJRnYoBZtikwK1El61CXt3ZioxvNMZnecDyOZFRRcIzgAHbLKCHJosrGDYoDJA9ZQZGgISC11aEJHzhQsLenBF+NZvHgge3+aML4Xw1ICgV22OshNxt6NlB3S9EkGqJZeLXQA6TWyzOE/4siFUyYMykJz01V/RcHVwYs0gzu88nnVucmLEBDtsMYBP317dJFZ6YHvkBZ1/hVRqDy7RT9iNSWfVSM5ULsl4uZyrOeeIOZTvPp66KcA38JjqST4eIwa5861XaS0KDcVE9CZduhfR0SfEy0VJPabfhYkPDfuPSD2v4ZFaeN1onCD4Xk9z8gkXM0S3+YPd6slFjb7rxvLfXQTwemLzFFGAhb1Y/EAoyOtGDknBufPXuwhgtkfN+BLOqJ4+R3nKkwd5jYBJeHqETTWC2KRovhLgJHaRSg2DGGQvOfoZaWz3JE70eee8aMmYdFKuO8pXEg0n/ORFGhvNIeoxLBw7Ohw3ZHJ5pTYXYslvFwbOlc+z/muxyTHORBDj/QVilT1AhoBg7gEACTZcJP7pXVEGtCU=</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>MIIG8TCCBNmgAwIBAgIJALmfaVOnBptMMA0GCSqGSIb3DQEBDQUAMIGPMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MS0wKwYDVQQDDCRSRVNURU5BIFNBTUwgRW50aXR5IGxvZ2luLnJlc3RlbmEubHUwIBcNMTUwNzA2MDcyMDM1WhgPMjA1NjA3MzAwNzIwMzVaMIGPMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MS0wKwYDVQQDDCRSRVNURU5BIFNBTUwgRW50aXR5IGxvZ2luLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDAvzTExPqK7hRWD3/KyRJilXTCD/obJd4XGZjwhjbnMVcyO48ll4fl7tPhNxnqNwDq/KrFbumoUCEROdwbvu2sdJQ27sG0I+2if0jesN2KD/yX+3Wsg9msTI1tPicxueBjd/mx/nYQGY24s9w+eLboxGr4WPCIV87PHKo447jV1oPkw3QL+2yD9XawrYVlxwf9ociTiz1VEgtdNonmq+a1giFSahrelKzkE/FsIEp1olWxDvIAc/LUcPfc0w3c8BX+OMHX3puyONeoShbJBMb34Rksd20mrmm0HiAINNFImwmvnav+hqX4M+2D1rxRmfQnKyKvIJ+RBh44ltpEqEN4YNgelGAcWjdyn6SpbXXcAqIHo4uFDVtDYosVl73HUpy6sme9MxgwLPvTymjMz5qzJOPRDVCGv6m8BmQzDRwZwnCnaxBjjNFzddV0WK/qgq2/UMnNYoVkDLWZJ3mOSWUborbDKaOnlRG5wtdQBL8lld4Ny57hZZyAmYo9NgsSkuUt6k5+2ckV+uzjw9nZx/WLUpxeO9cl46zxoVSRBTD2KJT/HLrwSgPGn9Ua34eZ7us0lHCYef/alosShx4/HDsZR5uUpYuCVtRgJaXJPQdusrkomXlVBYA9hHTBrcbFengzuZAvH1/SbcpdtAiyh3LrQI46zBU/rgMcL6dVB5nv3QIDAQABo4IBSjCCAUYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDSwQy/FZJsLCbdeJGzYLZ5cW+Y/MIHEBgNVHSMEgbwwgbmAFDSwQy/FZJsLCbdeJGzYLZ5cW+Y/oYGVpIGSMIGPMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MS0wKwYDVQQDDCRSRVNURU5BIFNBTUwgRW50aXR5IGxvZ2luLnJlc3RlbmEubHWCCQC5n2lTpwabTDAJBgNVHRMEAjAAMD4GA1UdHwQ3MDUwM6AxoC+GLWh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9sb2dpbi5yZXN0ZW5hLmx1LmNybDANBgkqhkiG9w0BAQ0FAAOCAgEAPi115CKvlp8TaP0AnD7q3PLvIFrTdw5AL7K02k3m2AY9WfoBL+LfyNfPJw/EItrzcgZhy4lEr1oKSX3q+ECFwAHDE06lgQytHkNnE9tUbnOHl3RsimF+J+pndyHVN3gh3pbUUvlvP2XJRnYoBZtikwK1El61CXt3ZioxvNMZnecDyOZFRRcIzgAHbLKCHJosrGDYoDJA9ZQZGgISC11aEJHzhQsLenBF+NZvHgge3+aML4Xw1ICgV22OshNxt6NlB3S9EkGqJZeLXQA6TWyzOE/4siFUyYMykJz01V/RcHVwYs0gzu88nnVucmLEBDtsMYBP317dJFZ6YHvkBZ1/hVRqDy7RT9iNSWfVSM5ULsl4uZyrOeeIOZTvPp66KcA38JjqST4eIwa5861XaS0KDcVE9CZduhfR0SfEy0VJPabfhYkPDfuPSD2v4ZFaeN1onCD4Xk9z8gkXM0S3+YPd6slFjb7rxvLfXQTwemLzFFGAhb1Y/EAoyOtGDknBufPXuwhgtkfN+BLOqJ4+R3nKkwd5jYBJeHqETTWC2KRovhLgJHaRSg2DGGQvOfoZaWz3JE70eee8aMmYdFKuO8pXEg0n/ORFGhvNIeoxLBw7Ohw3ZHJ5pTYXYslvFwbOlc+z/muxyTHORBDj/QVilT1AhoBg7gEACTZcJP7pXVEGtCU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/simplesamlphp/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">RESTENA Foundation</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Fondation RESTENA</md:OrganizationName>
+ <md:OrganizationName xml:lang="de">Stiftung RESTENA</md:OrganizationName>
+ <md:OrganizationName xml:lang="lb">Steftung RESTENA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">RESTENA Users</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>RESTENA</md:GivenName>
+ <md:SurName>NOC</md:SurName>
+ <md:EmailAddress>noc@restena.lu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index 80d0facf..00000000
--- a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.services.uu.nl/nidp/saml2/metadata">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-01T16:50:23Z">
- <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>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soliscom.uu.nl</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uu.nl</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="nl">Universiteit Utrecht</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
- <mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
- <mdui:Description xml:lang="en">Universiteit Utrecht</mdui:Description>
- <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/uu.png</mdui:Logo>
- <mdui:Keywords xml:lang="nl">Universiteit Utrecht UU</mdui:Keywords>
- <mdui:Keywords xml:lang="en">Universiteit Utrecht UU</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/419dd62d92bdaae8aef5a8a97b1c3f77"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.uu.nl/ict</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/lse.ac.uk-idp.xml b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
index fe216ab7..538a8ede 100644
--- a/swamid-interfederations-2.0/lse.ac.uk-idp.xml
+++ b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
@@ -12,38 +12,32 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIFMDCCBBigAwIBAgILAQAAAAABKq7oAYQwDQYJKoZIhvcNAQEFBQAwajEjMCEG
- A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
- bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
- b24gQ0EwHhcNMTAwODI2MTQwMDA3WhcNMTUwODI2MTQwMDA2WjCBpTELMAkGA1UE
- BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEXMBUGA1UEBxMOR3JlYXRlciBMb25kb24x
- EDAOBgNVBAsTB0xpYnJhcnkxOTA3BgNVBAoTMExvbmRvbiBTY2hvb2wgb2YgRWNv
- bm9taWNzIGFuZCBQb2xpdGljYWwgU2NpZW5jZTEfMB0GA1UEAxMWZ2F0ZS5saWJy
- YXJ5LmxzZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrE
- lEgnIq2xpH4ztZ3DAc5/1AiykNaad+v+5DHohA+aWemWgUqg9clHwaN3jkwK1g54
- R4//DrKcjxiCaPxstw3ODc7pG5lGkihZ2Ew2+fg/pblh4UhFMmRv7iaUl5jDoNz9
- 7y5/YZ0rStnPTQ3iynfl2ypURFh+9hSh7MiMqGjQjqkzjtve0olQlQ06srdGNSa+
- WhkV4IFr48L+fSpTJNnu/XLWposL+ZHVH5HSpOGST2dhXLA7tOZeGh0qC2XObgCE
- 4NpcDr3FQYWTGhDz95vb7kdBf7yrMBKwwkJC5DRiHyxS9zGlamB+nRvIgxYbLikb
- 7rugz0QDu/vQxxHvkCsCAwEAAaOCAZkwggGVMB8GA1UdIwQYMBaAFH1tKuxmq6dR
- NqsCafFwj8RZC5ofMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
- L3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvb3JndjEuY3J0MD8GA1UdHwQ4
- MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvT3JnYW5pemF0aW9u
- VmFsMS5jcmwwHQYDVR0OBBYEFIrzweZBjZRanmFejLLkK74xdaWZMAkGA1UdEwQC
- MAAwDgYDVR0PAQH/BAQDAgWgMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcD
- AgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBFDAzMDEGCCsGAQUF
- BwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCG
- SAGG+EIBAQQEAwIGwDAhBgNVHREEGjAYghZnYXRlLmxpYnJhcnkubHNlLmFjLnVr
- MA0GCSqGSIb3DQEBBQUAA4IBAQBdWOcNxu5Mh7ilUgSr8UlwWpjqJ7GgXMZwbVk+
- 2q++FeptORv0yJxIVvDsmbFwKqwvp3123aBAFaG9WQPAXL0Wz+P7wYymZH/G1XSr
- +NsLfXaYRvmmwySBWfq0NQJEU9uGDHTOtX4wCZLiQFfM+e+TRkwZ7pMHoI956bOp
- 7gYRTux7lAWqJbc5cJ9o61ev/AnP+5TPXEXNFzcLDP+zp4knO9JkG39yY3DO97fx
- S6FeuFcX0f1neB/aTknIH/D2by2/RTpvl3bTKKqoGN7YyQO7TH+sR7wZaSnqjKDn
- IEMWqUMBdf7PSA/0yLPierGPBFLmkn+UmFv38wt09uGqCdDj
+ MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
+ b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
+ dGljYWwgU2NpZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azAe
+ Fw0xNTA3MjgxNDAwMDhaFw0yOTA0MDUxNDAwMDhaMIGUMQswCQYDVQQGEwJHQjEQ
+ MA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25kb24xOTA3BgNV
+ BAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xpdGljYWwgU2Np
+ ZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azCCASIwDQYJKoZI
+ hvcNAQEBBQADggEPADCCAQoCggEBALTgyUuk/MYkOU7fRoZEhsP94EmmRVaf4xuk
+ unWtEP3uHxFISjOUGFMfym4Q9ZHN6NeFv6MS5GcKVy6oM+uXZM6ypMjh+VWLwWDM
+ RS28aDPKZzU/o0HPBzQ3kgXLW8R3rtrsrXHaU42x+SDj/JyzGtNmdqdjzzeWKZNZ
+ 6GeWwOgma58EEDM2gQxABrUkGH1dHq+WTawksWwx7Zsfe8XbM/x7q4S1GrWM1rig
+ TR2DXSzFY+gc3n65iAosEBNCOjsoyo7L7XwYHiEkEtO+9+XzVv/xVuI3jgR2C2Hk
+ i937R5fBXVD0Hu0/Ht0dd8MU523bJhLBzjkmZWSMQ/B1iFWijFsCAwEAAaNrMGkw
+ CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+ AQUFBwMCMDAGA1UdEQQpMCeCFmdhdGUubGlicmFyeS5sc2UuYWMudWuCDWlkcC5s
+ c2UuYWMudWswDQYJKoZIhvcNAQELBQADggEBACVXg7gRZZDbNhZPGVmaq3ESLYfn
+ 6/cpKUeDjoONhmEHx2XVJdXYT/nQFElzKwdpVvqYnmcZ8QDyY1JfSoUgrgUDxr+6
+ FsUc9VSkyQtv3MpBjszbIP1221XhOz63riFOC5PUKvoYY5Qx4nIsBZ96QoqT173E
+ dQNJHLnkvuwajtK98k18TxObCbkpCXnndUb0rYtEg/YCVIpw57CPXE4/lQpp2cL5
+ 4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
+ mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,38 +55,32 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIFMDCCBBigAwIBAgILAQAAAAABKq7oAYQwDQYJKoZIhvcNAQEFBQAwajEjMCEG
- A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
- bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
- b24gQ0EwHhcNMTAwODI2MTQwMDA3WhcNMTUwODI2MTQwMDA2WjCBpTELMAkGA1UE
- BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEXMBUGA1UEBxMOR3JlYXRlciBMb25kb24x
- EDAOBgNVBAsTB0xpYnJhcnkxOTA3BgNVBAoTMExvbmRvbiBTY2hvb2wgb2YgRWNv
- bm9taWNzIGFuZCBQb2xpdGljYWwgU2NpZW5jZTEfMB0GA1UEAxMWZ2F0ZS5saWJy
- YXJ5LmxzZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrE
- lEgnIq2xpH4ztZ3DAc5/1AiykNaad+v+5DHohA+aWemWgUqg9clHwaN3jkwK1g54
- R4//DrKcjxiCaPxstw3ODc7pG5lGkihZ2Ew2+fg/pblh4UhFMmRv7iaUl5jDoNz9
- 7y5/YZ0rStnPTQ3iynfl2ypURFh+9hSh7MiMqGjQjqkzjtve0olQlQ06srdGNSa+
- WhkV4IFr48L+fSpTJNnu/XLWposL+ZHVH5HSpOGST2dhXLA7tOZeGh0qC2XObgCE
- 4NpcDr3FQYWTGhDz95vb7kdBf7yrMBKwwkJC5DRiHyxS9zGlamB+nRvIgxYbLikb
- 7rugz0QDu/vQxxHvkCsCAwEAAaOCAZkwggGVMB8GA1UdIwQYMBaAFH1tKuxmq6dR
- NqsCafFwj8RZC5ofMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
- L3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvb3JndjEuY3J0MD8GA1UdHwQ4
- MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvT3JnYW5pemF0aW9u
- VmFsMS5jcmwwHQYDVR0OBBYEFIrzweZBjZRanmFejLLkK74xdaWZMAkGA1UdEwQC
- MAAwDgYDVR0PAQH/BAQDAgWgMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcD
- AgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBFDAzMDEGCCsGAQUF
- BwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCG
- SAGG+EIBAQQEAwIGwDAhBgNVHREEGjAYghZnYXRlLmxpYnJhcnkubHNlLmFjLnVr
- MA0GCSqGSIb3DQEBBQUAA4IBAQBdWOcNxu5Mh7ilUgSr8UlwWpjqJ7GgXMZwbVk+
- 2q++FeptORv0yJxIVvDsmbFwKqwvp3123aBAFaG9WQPAXL0Wz+P7wYymZH/G1XSr
- +NsLfXaYRvmmwySBWfq0NQJEU9uGDHTOtX4wCZLiQFfM+e+TRkwZ7pMHoI956bOp
- 7gYRTux7lAWqJbc5cJ9o61ev/AnP+5TPXEXNFzcLDP+zp4knO9JkG39yY3DO97fx
- S6FeuFcX0f1neB/aTknIH/D2by2/RTpvl3bTKKqoGN7YyQO7TH+sR7wZaSnqjKDn
- IEMWqUMBdf7PSA/0yLPierGPBFLmkn+UmFv38wt09uGqCdDj
+ MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
+ b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
+ dGljYWwgU2NpZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azAe
+ Fw0xNTA3MjgxNDAwMDhaFw0yOTA0MDUxNDAwMDhaMIGUMQswCQYDVQQGEwJHQjEQ
+ MA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25kb24xOTA3BgNV
+ BAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xpdGljYWwgU2Np
+ ZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azCCASIwDQYJKoZI
+ hvcNAQEBBQADggEPADCCAQoCggEBALTgyUuk/MYkOU7fRoZEhsP94EmmRVaf4xuk
+ unWtEP3uHxFISjOUGFMfym4Q9ZHN6NeFv6MS5GcKVy6oM+uXZM6ypMjh+VWLwWDM
+ RS28aDPKZzU/o0HPBzQ3kgXLW8R3rtrsrXHaU42x+SDj/JyzGtNmdqdjzzeWKZNZ
+ 6GeWwOgma58EEDM2gQxABrUkGH1dHq+WTawksWwx7Zsfe8XbM/x7q4S1GrWM1rig
+ TR2DXSzFY+gc3n65iAosEBNCOjsoyo7L7XwYHiEkEtO+9+XzVv/xVuI3jgR2C2Hk
+ i937R5fBXVD0Hu0/Ht0dd8MU523bJhLBzjkmZWSMQ/B1iFWijFsCAwEAAaNrMGkw
+ CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+ AQUFBwMCMDAGA1UdEQQpMCeCFmdhdGUubGlicmFyeS5sc2UuYWMudWuCDWlkcC5s
+ c2UuYWMudWswDQYJKoZIhvcNAQELBQADggEBACVXg7gRZZDbNhZPGVmaq3ESLYfn
+ 6/cpKUeDjoONhmEHx2XVJdXYT/nQFElzKwdpVvqYnmcZ8QDyY1JfSoUgrgUDxr+6
+ FsUc9VSkyQtv3MpBjszbIP1221XhOz63riFOC5PUKvoYY5Qx4nIsBZ96QoqT173E
+ dQNJHLnkvuwajtK98k18TxObCbkpCXnndUb0rYtEg/YCVIpw57CPXE4/lQpp2cL5
+ 4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
+ mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
index 675dca26..13632cc2 100644
--- a/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://onlinepayments.gtc.ox.ac.uk/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lshtm-shib.hosted.exlibrisgroup.com/shib">
<!--
- This is a "GTC Payment Portal" Shibboleth SP for the University of Oxford.
+ This is a "London School of Hygiene and Tropical Medicine - Primo" Shibboleth SP for Ex Libris (UK) Limited.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,39 +20,40 @@
<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="2014-03-03T14:46:19Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-05T10:01:54Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Oxford GTC Payment Portal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">London School of Hygiene and Tropical Medicine - Primo</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the London School of Hygiene and Tropical Medicine</mdui:Description>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDSDCCAjCgAwIBAgIJAIfUM6q/Gli+MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG29ubGluZXBheW1lbnRzLmd0Yy5veC5hYy51azAeFw0xNDAyMjAxMjEwNDBa
- Fw0yNDAyMTgxMjEwNDBaMCYxJDAiBgNVBAMTG29ubGluZXBheW1lbnRzLmd0Yy5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAo0jNoAJ35
- 4RSXKscYK/u467z0iUzdWgYOjMHe5UpBsWfFlI/Ht7nWyh9K0/oUlmON6OJrzwKW
- hZ6lUM3WB7aHcJU5rWDEUb79JVs0WvpHiyPdNc4HXw7qlBb+onytoul+/jUf7TmM
- /EXbQLe1pCrIvuw4hl8PA72x1w7wHmu9qHd+g2YL5CG6Dbrfm4pWdV25gHjJeEsb
- q8s0/tPXZaIf6pAi4xHKrNLPqN23gb45U2YQdQDNDyI12MXcnNtSjRNpf9pUFY5I
- kotJPTd63SRqhDb28F5suj95eJyTsNWfbpKuSt7hgEtSyY7L2zSELszRN61yDimU
- 6GZTNxKQJPUCAwEAAaN5MHcwVgYDVR0RBE8wTYIbb25saW5lcGF5bWVudHMuZ3Rj
- Lm94LmFjLnVrhi5odHRwczovL29ubGluZXBheW1lbnRzLmd0Yy5veC5hYy51ay9z
- aGliYm9sZXRoMB0GA1UdDgQWBBSpFZP5B8uXTAyHaB/6loL+XXZwKDANBgkqhkiG
- 9w0BAQUFAAOCAQEAw7mINrL58vxvF80oRDCfNYC9GbVPdL3BkXfkGHuJSeDWnwKX
- qKEu/eozVkqa5Ga/a+HLP2LOC1kron+345wrk/4YlJIil1Dzg1DtVaMJFP5cEeXu
- FF5rOpaPWGNnGjpDsOG1r1qKZllb8wIdlNWmA7wyx6+1qPRCbxo1lLTyGbmfFM3p
- ZLJDIjnSv6J3TRvdcAodbFFBBMpL+JY7nT+f4DzIKac74poPr5uTyVfm6aDbAF5h
- WROHDG1OigdsV0lHfv8R//K1WuravjH7pc14IsuVxpCqscLS7gG3wsF6lwLk1hdF
- oAOlTseHmkuBUL+dk7KV4h9GrQ/jeKO4EhVuYw==
+ MIIDMDCCAhigAwIBAgIJAJzvYQ51LpPDMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+ BAMTI2xzaHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB4XDTE1MDYz
+ MDA4MTQzMFoXDTI1MDYyNzA4MTQzMFowLjEsMCoGA1UEAxMjbHNodG0tc2hpYi5o
+ b3N0ZWQuZXhsaWJyaXNncm91cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ ggEKAoIBAQC32GeYKw8TF9cMM23p6fVihgQg8NjGIPKNLOOpcWzwSKQkJmSbroVF
+ WTEKuJElwjJE7X3XmqFcFzJdLSue7r03IoSKdIYFC14SUvpHXIWvVnwXp/QpPjgw
+ ifq44I9TlJkT/ivlVhBQ07ykOae/+bnzHzK2xNlgLjs2vzzWpHVUStjxTyaAgU/J
+ 5awPu5JVtbPXitzt4hdd7Q96Ig0Xlaz+gn27ZMLRQR73jwAn3IiTKghScU7fB/w5
+ 9OKpEW/1m8UnEyF9Dxk6zXOscCWz+0PeRQ92ca4zuDaAAFiIbCoO5FkzTnZbgAlH
+ lVoh/IC9Kf+o3I9JIdX6yb/NN6kX+Ha5AgMBAAGjUTBPMC4GA1UdEQQnMCWCI2xz
+ aHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQWBBTgnmqB
+ r5gxEx7iBUT8+9ZEH3s6hDANBgkqhkiG9w0BAQUFAAOCAQEApbLKd2sy7MFs5kE7
+ +ScntnbvXpKxGhV8wF2UDE+bzIRutPqunIE/vkw/S670dMu6aC4mHNTkZuYh5o2C
+ 85bSlganpDzPM6+VHMQ1chozPJGi8jikXeD2Aexl0qQUk2ueZ99U1Y2e9iVbyZuy
+ zlaZz1ByzhVq107N8RdosrOR2xef4T2p72V5QZ90t7iRD8VjtsqkhJUsabzwIA8K
+ lkpee42ow4OY4FGUBQ4x1mMhwRk+hAy95SCgeI7KbCnNGPfleGDS7M+uLcXpM9u/
+ D6odUzgJfKEHsWMNdAdH6tlCC59+9aNixr+u3G6PkxJFHnboW6EQ1eTFnJnwmsXy
+ qrSsCw==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -66,36 +67,31 @@
<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://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford GTC Payment Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.gtc.ox.ac.uk/</OrganizationURL>
+ <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at London School of Hygiene and Tropical Medicine</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Dominic</GivenName>
- <SurName>Bown</SurName>
- <EmailAddress>mailto:dominic.bown@gtc.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Alex</GivenName>
- <SurName>Clark</SurName>
- <EmailAddress>mailto:it-support@gtc.ox.ac.uk</EmailAddress>
+ <GivenName>Benoit</GivenName>
+ <SurName>Ginestet</SurName>
+ <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Dominic</GivenName>
- <SurName>Bown</SurName>
- <EmailAddress>mailto:dominic.bown@gtc.ox.ac.uk</EmailAddress>
+ <GivenName>Benoit</GivenName>
+ <SurName>Ginestet</SurName>
+ <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml b/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
new file mode 100644
index 00000000..42224c6f
--- /dev/null
+++ b/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lumii-idp.lanet.lv">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.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">lumii.lv</shibmd:Scope>
+ <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</mdui:DisplayName>
+ <mdui:Logo height="64" width="64">https://lumii-idp.lanet.lv/icons/lumii-logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</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>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lumii-idp.lanet.lv/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://lumii-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">LAIFE - LUMII</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.lumii.lv/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 867b9cfe..00000000
--- a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mahara.qmul.ac.uk/shibboleth">
- <!--
- This is a Shibboleth Mahara SP for Queen Mary and Westfield College, University of London.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-23T11:16:13Z"/>
- </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>
- MIIC+jCCAeKgAwIBAgIJAOwYneQhzo5oMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEW1haGFyYS5xbXVsLmFjLnVrMB4XDTEyMDMwNzE0MjEwNloXDTIyMDMwNTE0
- MjEwNlowHDEaMBgGA1UEAxMRbWFoYXJhLnFtdWwuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDC6euix10xI3odR6qK7o7F6N7YyLoO5c2th9Bo
- /b35Wr/qBVSgOzn1KXGYbCLVi4eVAkT8xTj2THbq1u1C1q8dyl8YQfAXDpaqYZo3
- nqXFgse4GhV4zjYyMsOUOgF0V7yWLxphFBjxyKhiTMejfW3Q8CDWWKKsDQeEhwgZ
- W3GHMyrK8q5Gryup8167wMaK6r4wT1/VbVTuYbpLKzlbi0I1gpZOmHlqOSXX3e7n
- AHWW3TkxQjWNb1eGhQrFUjHXncKpMwzHIM+PaminDt+SZo7y1StiNNP10TntE5A2
- TBfzoe3IDAOn/zRo0uXqZqC4ebjI2yzR2kYzzqefNjQjuoXxAgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEW1haGFyYS5xbXVsLmFjLnVrMB0GA1UdDgQWBBS/AXRs2oVTF6D+
- THVv7yl1bZJ2TTANBgkqhkiG9w0BAQUFAAOCAQEAKNPcq+ND9H2B61cPocxo7p4V
- d82vTDJNgq4qOBhSLiO0kV6tRf7hL6Y7t+/mb3Wx/HwJmKWbZUrk0EUSQINmjOGQ
- OAuR7O93J4SJIbV5ZYtjnVqmvXcQO2DSqISjxBRr3mr30urXxBOGO8uyRJg67jS5
- os06ShMhV0fFhCUk8WRxWu5BifoMTzBFkOHa52+NwYtwQT4aONuY2i4oG9NHjWj0
- 9o3kCjJO6/SHCxcXe9hGTfApb21kyXQKcSfNYwTnIqkxmPXhGu0X2Fgpo3/g31P8
- WiYD2aYtXd/zZbmDIrYXVHx4QlflHS9YB8RvA1ka/vrQL224R2jgl3vFARpqCQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Mahara</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Services helpdesk</GivenName>
- <EmailAddress>mailto:its-helpdesk@qmul.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Moodle Support</GivenName>
- <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4bd18ea9..00000000
--- a/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meals.oriel.ox.ac.uk/shibboleth">
- <!--
- This is an "Oriel College Meals" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-08T13:49:11Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJALmb+DO/MaS5MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGG9jLXdlYi0wMS5vcmllbC5veC5hYy51azAeFw0xNDA2MzAwNzM3MjVaFw0y
- NDA2MjcwNzM3MjVaMCMxITAfBgNVBAMTGG9jLXdlYi0wMS5vcmllbC5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgsApZRfnxtPZO5Hlo8
- XOJOqeY06UUqgPmZHMPqf3qbfsJF9xhiZsa/0ibzVLgOnt260hbLx4rNSrJ/9wqz
- CuZJo2m+fgH+ZmwSZ0ZKQEdBxijLdlCUzicGviHGISVa9pEU/9SR2MU14e+A2wZG
- c579TbmbM6w8pHjDPAVIWCOTr97s6tb/XDKWenLEyFZbCELye5yxX1MW4g4tuqjb
- s4UfPdqgpW9FMNchrrI1zPRGFhYABG1KfptlOl7szj3qXq5moEo5muv98oMtB9aZ
- ZGHT85Mid0oz1BQNruFNwutLkWi8Gmah8mRXKqAfmF6Na5SME3rFH2PvQgeKxFVm
- RGcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYb2Mtd2ViLTAxLm9yaWVsLm94LmFjLnVr
- MB0GA1UdDgQWBBT4ryll+f6nterkgUsy+VKPBeg9ITANBgkqhkiG9w0BAQUFAAOC
- AQEAMEq/A5WkFnihpXsWwBny88AIJzDHl5FmIJGoHbTQnfBNYvSOUa2fath1EAsO
- Xk6AFo/lOmIFIT4TgLWU1i1hnnVJnCEDDCg4aB8pmj46xrdNEa7u76gk0nrBfHIx
- LT5Mh2cquN+9Z/TGuLw2prcFXdRxbptp7HyB/SBgHYTEtR7sdX0haUv/PA+ZzUsI
- r6MFmWXUYci0/1YgPys4wGRgAG+NHLE971WSvxx8IDW5T4gYF97hOMAMi/OPNPHZ
- xAqkSqnwVVs56gUqm4F/yMP1Awjz5xbsrK1FldW05Srlls6dQ8+GzB5Z1VlxMHDz
- odYX/MzKAdQHVZQ3URmqkhT1Iw==
- </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://meals.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Oriel College Meals</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Dale</GivenName>
- <SurName>Lloyd</SurName>
- <EmailAddress>mailto:dale.lloyd@oriel.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Dale</GivenName>
- <SurName>Lloyd</SurName>
- <EmailAddress>mailto:dale.lloyd@oriel.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 213c5f8d..00000000
--- a/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.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://meals.queens.ox.ac.uk/shibboleth">
- <!--
- This is a "Queen's College Meals" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-25T15:23:00Z">
- <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://meals.queens.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAMAjMajvPz0aMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFW1lYWxzLnF1ZWVucy5veC5hYy51azAeFw0xMTEwMjQxNDQwMDNaFw0yMTEw
- MjExNDQwMDNaMCAxHjAcBgNVBAMTFW1lYWxzLnF1ZWVucy5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0Ujc3SARKgpkUI63cpU+6PJvkB
- 3V8HXAhp3kgMuQwmnYPDoP841SKFgpdMmVhTjyUMBxi8OdoHMEWUQHIBlvZ09Y2Y
- B3imiyyBTWyiQ1XYi8sMfdcBDIKAz6MAQnCaHvQLsFsIVcx/JmjcXYk+8opasie9
- aWO/HJtZjuRbD8t5WYIEvr8r0AvP+xyIsgHqoUdPASJmASBh8m7nrQJxJCYGf4HF
- f40KS6vRnHLqG7NtdeOvrtNsAj5PM2xS5mE8/yTRHShAw3Mfi/d2N+w3GimQ1Uz5
- rEscoavvonA1PxyI5mJYN5Zbp6SO88Y2VkLTOuJtup8zS8KuxSy5R7zQS9sCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbWVhbHMucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQW
- BBSwvlfO/FTSVbEK/jfZvVIKJj873zANBgkqhkiG9w0BAQUFAAOCAQEAp92sniTk
- ZSASz65sXSEy+fJLa74U5i46qmZ/X34fsGLf0M0TeJvaSzIhFHaq5QKIY/g6E5mK
- B8nWM5/BF63D24Zaan9TPlvDhzxGZjeShl/OTNfzXNglNQmjGaxbevVUslZjx0mN
- V9YgkAEtf9UAsf3Go2FwHZK5JRy7QFe2SEjlHZ6EjepKE7pykfPSbCDYnKe17dQ+
- aqKbidJ2A2qvk4Q1fJYXt6BKk3QZkXBDeFBUq57rsWgyBZQktwygfpRWBd3Xtd/g
- 3PB65hPlPbSG/nOvJYuygzVd27oDnjZqYq0chh9ii4ZBM94b8/aB5sUHUaVNGe5E
- YBkjzBZwhE01Yw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Meals</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Queen's College IT Support</GivenName>
- <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Queen's College IT Support</GivenName>
- <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e52425e1..00000000
--- a/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meals.some.ox.ac.uk/shibboleth">
- <!--
- This is a "Somerville College MBS" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T09:50:01Z">
- <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://meals.some.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDADCCAeigAwIBAgIJAKdoXXjdRuKBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE21lYWxzLnNvbWUub3guYWMudWswHhcNMTQwNTA3MTIxOTE1WhcNMjQwNTA0
- MTIxOTE1WjAeMRwwGgYDVQQDExNtZWFscy5zb21lLm94LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3pZqASbklNp3OW65A/tnT53MAtVqLHpT
- cFTZ4rNWM/IINC0ZvXP7BWL589NCpaHd/df4iA0wro+FcV2TN+t4cx1Rkbz2mAst
- bKeRwGildmWxAoaR9d6bEKCcAx/2iEUoc/oLOixHn1sXekaSWWn3aHHPxyMJDIwZ
- kAhqR0CVx07tysXDprs1+hN7QWQGntNOGVTczQ9lwsDGleMpJ72xhU8FcWN0u39F
- bZQBXZH1tEixD1MAVKTpU5DwPw32LA7b99nROZe4w15HZTX9s/Xtj2le/vI4CquL
- JwT/qceQYeSfiB+oZh34xHwU9e3mwVFcoJ0LZbcjdtDhTmFzpL7gzQIDAQABo0Ew
- PzAeBgNVHREEFzAVghNtZWFscy5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBT3GkjK
- BbnQcej4g/y3dazREgp4RTANBgkqhkiG9w0BAQUFAAOCAQEA0ZH/J9U3r6izhN4v
- c+wdNsk1lay9K4FBFUa1c+DG/CKC8bt6lDl6aqG6kvgEYyoDQnJOTZGMvfxFnILV
- M6wdVOp5xuPq5dKdaE/70m70+5prlGeHU/YNWzHberTqMECwh9oTwgwpkKozAphk
- F8JKeM+VucOKir0JOHVcUDosUMxKE/7wEqC5tPUPhEfxNPZjU/EqKqK8VGWgvOmX
- 3lKemjnQyLllbHV4tHvOZ0haaI6p3eCvJIB7sHoe44icIgcffxJx7+vojZ6RJWSs
- OeDLSoVBc18OSRpvQLpc4JSFrhflY9L3LUBJCxMEiDBjMWfd8NOpECzTJ5YW6Ua7
- 4GrqaA==
- </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://meals.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College MBS</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml b/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml
deleted file mode 100644
index 66ee8d15..00000000
--- a/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://members.myworks.co.uk/shibboleth">
- <!--
- This is a Shibboleth SP for Boardworks Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
- MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
- batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
- Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
- lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
- WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
- q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
- AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
- L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
- qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
- PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
- wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
- nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
- wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
- GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
- 8rYfwQ==
- </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>
- MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
- MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
- batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
- Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
- lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
- WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
- q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
- AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
- L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
- qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
- PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
- wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
- nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
- wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
- GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
- 8rYfwQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Boardworks Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.myworks.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Catherine</GivenName>
- <SurName>Marks</SurName>
- <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Catherine</GivenName>
- <SurName>Marks</SurName>
- <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
index 94f9c40d..86deda1d 100644
--- a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
@@ -25,6 +25,11 @@
<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>
<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://tannerritchie.com/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">TannerRitchie Publishing</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Medieval and Early Modern Sources Online (MEMSO) is an essential resource for the study of Britain and its place in the world during the medieval and early modern period (c. 1100-1800)</mdui:Description>
+ <mdui:Logo height="116" width="491">https://tannerritchie.com/img/logo-blackonwhite-master.png</mdui:Logo>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml
index 8bb00cc3..09bcc95b 100644
--- a/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml
@@ -74,8 +74,8 @@
<EmailAddress>mailto:j.acland@qmul.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Kieran</GivenName>
- <SurName>Whitbread</SurName>
- <EmailAddress>mailto:k.j.whitbread@qmul.ac.uk</EmailAddress>
+ <GivenName>Jez</GivenName>
+ <SurName>Clark</SurName>
+ <EmailAddress>mailto:j.p.clark@qmul.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 5393319d..00000000
--- a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mobileauth.labs.jisc.ac.uk/shibboleth">
- <!--
- This is a "Test Mobile Authentication Proxy" Shibboleth SP for Jisc.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2014-10-27T15:06:33Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAPBv1wp/OCGRMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEGlwLTE3Mi0zMS0yMC0yMzAwHhcNMTQxMDA4MTcyNzQzWhcNMjQxMDA1MTcy
- NzQzWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMjAtMjMwMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAt3TRLhrGfSXumBs5SmnJC+yfA3rqF/QD4fZw9v/d
- SveQkvvyrExRLkxDCIM2k1zxyKsZcn4IS9teBOUYcPFi75NPSQUqpUkeBEoW15+g
- 1CKDgVtwMcCEDubppfov27Js9Dx1+AAtd6o/UWpZiGo+dmDNCIKZuABGZN1jGXRU
- VcmsnV83kuxclC+lBBk6t+U9WXI1LJNo3VNBm5F57vH/gLlou+/Js9Vt6fyDcpOq
- FTj1ge4O8kZZIB+YeIJXA4oEVgPKXrLpnMDQZp5xtued7cX2IWwartY78doRaurm
- bCHlsHljJ226bteRxbr2e1P95sLDXAkhCPndoNbltAHpxQIDAQABoz4wPDAbBgNV
- HREEFDASghBpcC0xNzItMzEtMjAtMjMwMB0GA1UdDgQWBBSZ7kmarCHOt+GFQsqa
- F9DvVFNEmDANBgkqhkiG9w0BAQUFAAOCAQEAMXl2SEg4EN0e7qsLuBUiF3x/fP6w
- jd1aW4RQEN5DOfgZ01AK80g1VXbIv1LTg1/Sm2x5q3BZX1oC+jsBGFUgx/F8RQVY
- 78G97m2m3DVY1D2fehCLYsDcgqVBo2LukhlBL6VbUdJhN+uJVklg5IBPI9ETxijK
- gndnJMwOxMc+buHndoeVlAs/X55FdDs5zLMb0h4e9VbYCG1aCKWsF3ECJFhp87sv
- 0FZvRG6zm2EPpEqSV0oXoY+IPMPisIDSO5jm3Y49W50XW19KVc0oeoPpfsatzvq/
- 8J/wFQ9AjU02BhtkFOyzvJznUQqbPG+SpHHO9++dYfjF/Arkr9f8mZzLxA==
- </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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Jisc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Test Mobile Authentication Proxy</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Michael</GivenName>
- <SurName>Webb</SurName>
- <EmailAddress>mailto:m.webb@jisc.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Webb</SurName>
- <EmailAddress>mailto:m.webb@jisc.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml b/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml
deleted file mode 100644
index 8b3aef67..00000000
--- a/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodle.fsp.uni-lj.si/sp/201411192359">
- <md:Extensions>
- <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-21T15:11:09Z">
- <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">UL - Faculty of Sports</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</mdui:DisplayName>
- <mdui:Description xml:lang="en">FSP Moodle</mdui:Description>
- <mdui:Description xml:lang="sl">FSP Moodle</mdui:Description>
- <mdui:Keywords xml:lang="en">FSP Moodle</mdui:Keywords>
- <mdui:Keywords xml:lang="sl">FSP Moodle</mdui:Keywords>
- <mdui:Logo height="300" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAOyxJREFUeNrsnXd4JVX5xz9zS3rbTbbX7NIWWLqAdOmCdBBkkV6kCSr+VECw0EVFitIUERRBVhFFiiAqiDRhQUDqVrZmd7MlySa3ze+P8w73ZDJzk5tN9t6bfT/PkyfJlDNnZs58z3ve855zHNd1URRFKQUi+ggURSkVYoW6sOM4+vSVocJRwG7ATsA64DAg3YfzJgNbAbvLuecDH5TKTRekdea6bkF+gEqgESgPyFYFMBwIU7W4nOsX3DI5Ty3HoUM5UBVU5wHDpKwUmjsBV36ezuO8e6zz5gC1pfRiCqEbsQLe73bAycAUKXRtUghrgbXAO8BlQFfAueOB74to1QKrgAY57zXg2/qdDxkOBX4GtALvAVF5701ARqySpwucx68Dx0kZvCWP824BPif3cr+UX6VILayoiM1k4Dmrpvk3sDlQnatFKYVjV2ChVbNNEcttoNgKeBG4KYe1pwwudcA04C6rjHwAHAJM7aOFNQG4FNh0kPI4RfK1VKz8fPhIzt0pYN/hwJeK7H1EJE+HFkQ3CihYNidahfFzeT7Aa+W8owfh5fzVytc5qh0F5SDrXeyS57lPyXm/GqS8fUPSvynP83aV894OcGPsad3v/kX0Hr4ueVpVCN0oFl/PSuvvRJ7nLpDfLYOQrw7r71WqGQXF+2hfBF7K47wmjFMbscYHg2Pk9715nneE/H5Imrc2niingWVF9B4+I79nF+LisSJ5CPH1ONdr97cOQr7Ok+bHLOBB1YyCW1gAj+Z53nLgBmAScM0g5GtX4FPA88DreZ47Q34H+eAeA/YGZgJvFtF7uE3cOV/f2HxYNodZ5u+Bed7CfnLe5vpND1n2ssrHp4osb3dIvr7WD0vFBd4v1ZeyMTcJBwINZRi6fFp+vwW8UkT5qiDrc32on/f0a329+pF7VAFb0rOHL58evyaMw330AObLwfSCVvVy3NaYWKPBwmFgez8Hqyf1KPk9swBlKNc9HQyMFXfBAp+rpbdv63j5/fgAP88DgaswvavF8O60SRjSJJxmbauXND8i66DdEbgd+BDjTP9PL2Z8M/BdTOTyGqsAnCYCtiumK3oG3XsQKzDdvscAOwBnWL6KCuAK4FWxFpYC72J6ST2iwLbAA3LtRhHLP0g+bpDjTpFa/cvAV4FLxK9wmlz7HEwMUxBHSHrtQFKEYH26/IcBN2M6T37n23e0XKe/vbhbW2XjM3meOwb4keTr8oD9cXluy4CfB+yPYvyXD4Sk/xfJl/f+pgG/AT7GOPjPDjlvWznvrZD9BwHPSjq9vZcG4FRMTGMZJg7RBUb4jttR3vMqeVd2pX4Lxtf3HrBzjmvtDzwj31XzxhzWMNCC9S0rvfcwgYcvywd+FzDf2n9zSLpf9KXhcSUw19q3ChPEahfyy4Elsn++iFYDJpp5FXCSfIjbYZzIdpf4blbay0XgFljb3pbjfiv//w8Tx/Yy8Dcp5N6xP/DdU7UIyhvAN4GrgcVy7H/JP4YIuYdW65pJTGCvx3Wy/R/9FKxvWveZD4cDKStffiHd03pHLvBIQBony767Qyo0l2xnzwny/z3ybp+Q/w8POPe7su+6gH2/svLkSvkO4yuYAOv35VivnNzmO84Lu8jI79/I9unyDH5INlr/2YDr1Fvi7GJ65EeqYA2cYAH82UrztoDz7rP2Tw9J+4YAwfJq5jd9L9/PI5gQDc/UXiYvPYj/SFp7y/9XW3l7XCysI0WQjsAEQraHfAwvyHl+n0qlFOhWugflbm9d69A8n/2uYq2einGGu5jeMpuzyAYE9wfvQ/lpHudcbH3s3vCXk639ZwOLpCJ5I0e584I69wzYd57sOwvYV/4+1tr/JcJjs/4t+7a3tpWLdfQCsI/sX0JwAHVUhKXNsoiOsd7jbj7Bfx8ToP1l2b+dNGUXyzMAuChEuLeW8n+9WGKuNDlRweqfYHmFZSvf9u/I9jdCzpuGGfbjL2g254cIFtLk8mpYv39rEt2DTa+R/+8DzgS+J5bat4FbxepyZTuYGBzveewUItK3hNS4rojIJN++a+zC5uM92Xdens/+93I/iBUbFGB7kmzvT0jBJv0oF/vLBzrdVxlMtcrLG8AoaTa5Ikz+Ma1ny76XQ67ziuy/QKycA0IqxBtDmriv+rb/3KrQ9pZj/hRy7TmYcBs7LGkHOefNgG+rSf7+QCzpmPw+3TruYTn/eN/5Z1pi74n7lhu7YB05ABbWFiGC9XzIeZXiQ+qvYNVILe2vvZEm4UcBNfUfgScxkddPYSLpX5JabSawh0+wUlITBtWwUd+2yeKrCROeg3JYULPJf7RA3PKTTJPz2wKcvZfKvh37IVieRTCXvg8M3kZEwf6I/27tnyI/SFPIlWa3zQireXV+wDU8a/Id8UOd7ts/1qqEZvj2fc9XOXnPck/rHu8MKVdIGXJFzG1+aFl85MjzKdI8vimgYlgLjAw5//N+Ed2YBesQS7COz7NQnyZ+k5oNLFi2f+Y53/aFcn3EZHfJLzq7N8EKwvNp/asfwuD55A7pZ7PtRjn/RyHN3bf7me5jku6d/Tz/OwHiYDfBltoWQ4B11GZZZjZXWOX12oD9nkgvFP+PzesBzUF8nTZz5JiJIfdzbIBAevkdEZLuT+Q7+Q09g6Cv78Nz9nyt+6tgmVoxE1Lb9cb10tZ3CiBYO1kFd2fL2btSevds38J/8+g6zlewjrbysVcfrzFc/Cz/sM49rB+iMNJqWvs/wq1k++f7ke5kK90T+ylYnp9x94B9nhviyYAm0Jocjngww4O8Xj4n4Hksl/1XhpSXd3KUhT0InqbGsxZfDDjndtl3R0iaZVIppaQC2dRn3XkV1i453Cc9mpsbc+DoPLJj9fbI89yDLX/ChuZVy+/gid5xYravCPDHTBmEPNRavU23Av/sw/N6VD7UneXZpWRff8rDF+SDeJqeQ1N+LBbfQ/1Idx9JdyW5Y5XC2E78WB+HWLeeJW8Hbh4hFY4X7/XLgPOmWx/2VQHlzpv26E269x5juTseylFej5PfzwY0JaFnz+IJlt/w/pA09xKfZlTKiD1J4KGy7+85WgHejBH3FlwpisTCss3/dQH+qDCmyzln52gODKaF5VlUXvjCDmJJ7RZihV06CBaW50xfENAciFuWXpxsz+k9mDALxOfkWRS75ll8POetSza40/6QXGCzfhbNP8j5v+3DscMwMWh2kO0FIU5vMPFZLtBpnbObVEC7iBWyynLEb002yNfrbHmfnmEgR1rvbbeA677vs/gmk+0Z9h+znbXtALLT6jg+K/GjECe+zd2ETy74uOw7KYcl3oYZhN1k+fhiG3OTELIxLy7BQXxBPEX4oOcNJViIie/lPciamEW2R3GbHJbS6DwFy+5NPDVg/+nij7H9FD8L+NjX9VNc9rCaODZb58hTXxhldSCc2Yfj76JnEOZLcv4xOd7rbVaHRKtUlF7T62bLYrKHA3m9obf60txUPuowP+ynLNHxeEXei8ee1jF2p8oD9AztOEasOC/GyhuMvKVsi1ri4nUA7BFS4S+V/3ckG5jscbbPP3mMZ/Fu7IKF9EB4H+BVvRTSB+W4A4pAsC4nd6Dfhdb+pSG+gqcwEev5CNZTlsUUxFuWQHm9S36zfr/18GF5ImhHgu8uArg+MyNcYuXpC70c683PtKdPPFxgNcHDn/5o+R2Plub7oT5xmI4JE0liItPxNee+am0bJ26NXCL9f3TvdXwxQGS9cmQ3JUfLfdjl9DIRqwlSubtiKe8ix15gnT8j5L3b1vmpcg8t9AxL8SzoHeW4tSLwKljSxLBF631M4Nv+YjofIm34NnHSB032N0EK8RwrnXvpHs90sPgpvP2vAeeSjdAeKS/9XeuY+0LMfMhGPb+Tww90t5VWBtOzeLM4SpeLL6xK/CjPW8c+KIXIb5nZ84j/Ve75BinsP7WsJq8H7Dxfz9b+mADVZ+Sj9NI5QmrVmj4Ii3dPqzDR23fKO5vRT1/cIWS7511LdO4UB/Z18pFdJ8LiRek/7EvLa7b9MqSTYJ3VJPyQbMzWFGvfSrGM/b2E3/IJwL5yTge5h7X83aqIn5NmZyREHPbxdUi5lsP9WekMqMUEla6xmoRtmBEaQdb9tr7t40Sove9sIabHHZ9Pz7v2MkzA67baS9iTI+TjSfkKb6co/D2ED0beX5zK12Aini8X382XZb8j5u2vRQy/Is7hmZao7YwJirxB9n8TE7uSywf1H8KH+Xh8UQqQfV8psnPQV0uNeSdmnOM3MN3RT5Cd7M2zDu+Q2v528fM8JmL/qPgqXhRBsvkF3YcU3SlpfdbK0xp5bn3Bi3T3glXvpv+DxCfLe/2T3M/tYh3OlI/9j9b9PSadC3+VZ+MfqfCI5OmzIZb1Aqv5bvv9dvYJcBA1VoXyNmbI0I30PrfcM3JOQp57PKQXcH7AuV5P7nJMRLrdsWBXWv7YrPGEhytsZ1WezxAcJ+fFjM0WoXYK7f8uVsGyC8d06eXYU2q7Yh1VvrU4c3vDEStwlwLdzxRptvkDBMeKBTkqz/SaxQooK5L3MM7qhAgTkbEBH7fHNMJjmezOjJ2ladTXWRGGix8rTNAvzdEx0yTlKxqwb3N6jmrwKJPzGkL2b0X3cZ9+GkTYyoulw67YBUtR8sVr+l5dYvn2hr1sUioZ1gn8FGX98XoFby+hPO8oVupM8akpIahgKUOJaRgn+M/pPqFeseONGbxRX2ERmnXaJFQGiJF091N5MVJTizjPtWSDecH4wJL07OlU7SiylZ8VZX04DNNj+AVMr+JmmJkKzqD7TBnrb/40DeOohnpaUimaYjH+uGo19y438cqOA2c2Defg+lqSLnzU1cVlHy/JldzvMY7yaZg5za7AhBScqq+0d5xCWTuOowspK+vFqWQDZp/AzIrwICYMZMCY0djA/VMngQNuxv2k3D6xei2/XrGS05oa2bdOQtZiUea2dbDJf98jHf5dPYeJOF+ImWurUYR20FfP2beuhh2qKrlxycAs4VkI7VDBUkq2ssXEtR2IiW26hfzXBcytiE3DuGfKRJYnU7RlMkTIjlhuiEapL4uxKpFidToNGIfwiHiMO5at4OL5i8KSnYQJzN0cE7B8I/kvHpw30ysreHbaVBqrKvnWR/O5bvH6r82qglVaDMfELP2vQB/rlpiZCFardvWNXWuqmN2VwHVhx+pKOkSE0sDLbR10ybcwubyM2yaNY//6WtrSadakM33qnXIxDrVxlRXcsngZX543OAtNH1BXw8H1tfxwyXIWJZOfbN+mqoIrx45ibDzOibPnM6fL6ODWlRU8tcVUGqNRlqdSjK0o59qPF3PD4hZWidiqYA1NwYpjHLoHSc346w3se2jGDFE6DxN8usVQFazKSISJZXG6XJf5XYke67jnQ300ymVjR/LV0SP459p2Mi7s11BHMp0m6jhEIhG+vWARVy1aymlNw7l87CimVJazuCtBZ8YlmkdRdYGoA+MrKrh18TIu7KdoTSqLc/m40SQyGa5etOwTYZpaXsYzW0xlUnUVH6xt56X2Dn62bAWNsSiPbjbF5MBxeLWtnefWtuPgcFhDLRPK4nycSBJxHGIOjC8vZ1FXgh8saeG3K1qpiERYkEiQdlWwBluwtsM4LrswY8vS4s9ogE/KuYuJEq7CjIkqw4wze7ofVtXzZBe8uAkzdGdD8UOyg27nkR3DOKTYrqqSy8eO5JD6OlpSKR5tXcML7e08sGJV3mntU1vNleNGs8+wOhav66IuamylJckUccfBBeKOQ200QmsqzZh4jC7XZans7yNRqcw6vQ0RYHxlOT9ZtCxX87AH48rifHlkEyc2NjC+3AwemN3Zxf0rVtGSTHHuyEY2rShjTleS4bEoTWUxViRSRBxIZFzWZVzSuDTFYtTHTGD88mSKNek0Met+Uq7L8FiUumiU5ak0XZkMv5bn+9uVrbzR0amCNUiCNQXTU/QFsgtRLMOM/ctIYfLGTG2BWdsuhhkCcW0/rre1iFZ9AQQLjKP51KEoWNtVVfL10SM4rrGBuOOwoCtB3HEYXV4Grsvza9r52bIVPNS6ilQfyu3nhzXw4KaTSbsZ5ncliIaUOa82izkOKdclTc7xUt/FjGN8xtp2C2ZCxD/70xxfWcGti5Zx4fzeLa2vjBrB98ePpjoaYWkiSafcY0XEYWQ8juM4LE8kWSuWoXcdT3hTrpvXOC9XhDXqOESAkWVxIrEo89s7OeC9j3i/s0sFaxCbhJthBhZXYuY5uiDkuFGYKZVvJDuHUL48hplZoBCCdTomMHJICFa54/DAJpMYEYuxZVUlw2MRFncl6HKzUc0ZqWEa4zEqolFmtXfwlXkL+cfadmKOw+41VdRHoyxLpXixrQOAGY3DuH+TSaxMJlmTyhAZuOL2iPw+Un7PxIwP3D3MpzU8HufDzi4umreQZ9e2BSb6jTEjuW7yOFZ3JVidzhTsfaRdl0kVZSxMpDjg3Y94L4doFUI7hlIc1keY0ewTCBmsKSwV66scpeBEHIedqiuZUFHB0q4u5qxLflLj282rDLAsmSKSTLF9VSX3TZ3II62rGRmLccSweipiMVYmEjzSupqo43DksHpWJVOsTmXy8kH1gbswM0eMleb5QZiZJnpWypgpMJYnk0yvquCPm03muA/n8eTqtZ8cM62yguvHj+bA+lqWdnaxLlPY8XJRx2FuZ4IJ5WX8c9pUblzSws9bWlmZShVFeRmqgaNOHwpdg8pF4XFxWZ5MUx9J0pVxQ5tt3kt1xadTE41w4agRpFyXJYkkiUSSykiE05uG4wKLkylJb8CzPEt8VfMxftPdpKLMmec5nV3URqM8sfkUnl3TxiXzFzG7K8Fjm02mubKCj9d1kaI4xsrFpDk+PBbjholjOb1pOA+uXA0uA2mpqmDlwV9VKkqXmOPQmTG9h/a2pOsyP5G0rIVBufxCTCjLTpjZQ9/oq+XSkckwryvBHrXVPLnFFNamMzTGoszp6OxhVQ4SVRj/51P0Msg65jisSadZnU4zPBbjynGjiuPda/EfknjzObUMcLrjMDNxrtvIn+8scUH8Mscxe2GWPbtdLLFPLK6FiSSVkWzPZHTDhfjMwPh396CPs0I4QGcm061y8JhYCBfCRljY9iP3VLZDgb/Qv7UAc7ElJgykdgg8n7hYSI39PP8szKpAufgFplNmfNBH15Vx6UhnNuTsjXFMWMz79G+x3aJgqApWrvDdKwhe+3BTzHzof8H4uA7I85pRzOyok8nOLnkRJgzBK7ST5MM/GrMoQb3vXWyCiSs7FjNFcn0/7v0Kus9fP0auHzRHez2mp/R3wN8wqwIHLfU1TPZtgfH91WKczmPoOdWvg5ma+JeYbv4rBqAybpTn9XtMCMEZdHd0Xyj7e/tgvXbNMZgVaw7qR14mY0JibiAbj+dnd0yA8Wyxrvoq8pVyH09hBnYfmuPY/THrENrrGmyNmev+QF8rKo4Jx6jFTDcNpnNqfKm1soaqYIX1AG6LmSzNP5r/BsyiAttj5tY+UwrNBXnWYOdgur1XYAa2nolx0HrR6Mdj5gGfKYJk29kZ+RBeFwH5GlYgYh84Svwr3lzkt0qaCzFzQ13uO/5ojOP4cMxiG89LIf433QcQ/1ialt7iA+/K/SwEFtF9BaAtMSEfX8XExx0o+XlVmpP9YU/MnOYni8BcgJk7/j1M7NM7mLn0F+bw23wHs+zXEnmvl0il9myeeTlU3t1FIvRP0n2K5N0x86DfbX1ff8E45f8NfDpH2kdjZm84X+63TgQ/aG75azB+2BlkV5feGeNPO8F6f/tgFmNZipmTHUy8Yru8+5+RXURXBauAnCwvxftpwyySMAuz0IM38rNOTOSTxSr4HCamxltz7twACyKMTvmYvEUETheL61zMwhmeMHrLX3mLB9icLk0JT8DyGei1VJog3rV+hBnGcxxmkPB9Pl/GTMnvnphFMK6Qv2/FLNhxuhz7pJWntcAp8pxOkLS9NQkPETF+R6xTb7Xh2eJTO6cf73FrqQC+KX/Xi+VyFGYc5YFi6e1K9xWcPXYQIdsTs1DoyZKvHTGLeCzOIy+fEYvmDLHUviuWdEzK1G/l3XpDppDnvo1UXLsCL9Bz4VQwi43MlLK4GWZ654OkzF5B93ngL5afGbJ/pWz/GdnOpIhVuXxWyiCY9Q53Fiv+UwQvQKyCVQCelw/qFPnwTpUX7K2f53Ul/VyaglfTfUzeTZbFsHke171LPohmwtcKnNVLGs/2855fwCzv5Tl4n5OfmfKhvW01ae7HrKrzINlFJLbETIhXbn0YYKZueVL+XoeZaO4vcu7D8sFsLpaV/ewQQbjf+uDz5ToRhbnyf0oE8AOx4OZIvl8KsYb+I9bOfiKk94mlg0/A+8IPMavpeO/veyJOKyUP/xAx+o3sf4bsmpj3ifAg4mtzjtznYhFW7/11WWK0vU+Ed5HnX4Vx6t+MWePwYLlnT7yXyHZvqbc/iYh9IFbv4lL7sIdqL+Gb8nL8/EE+nF3khbVIYbkzR1rtfbzm9dIk2IQccTlFwAzLt/Uq2dVuUpjVWTx/Sz6zUNRhHPI/FssniBVBG8ucCPWxKOnggP1XRHi2Ibvo6L4iBq+L1RI0Nct20py6h+6jGSZLM2mWCHZfKZP3WitN4zfEAm618umtDn2J/H7cl4Z3bLO1bZLVfLuc7r26E8h2CsQs/+ApYplfLPfeJL4orxPgAGlR+N0FiBVY0gxVwarIse8W6+M5r5d0lpN7NoRNxMS+Vj6eyUUuVkgt7DVXniMbAuGI5dlp1fB95RV676QInIZzTTrNC2vbOKlpOKtSXf4u/muk6bbM+hg9h/QRIdepF/GcZzVrPTzH/D15PrOEVIK7i//q9JDjtpRmakYsIJsGn3AhvrVyqTh+4Tt+L4wTPilWET4XwufEaj5YrpUISN/zbU2XY18r9Q97YwxruKaXmmYLy0Hp9CLqk0Ws9hXz/LAiv/cass5zz9fVIj/LpLCvk5/1HdBWLv6TIy0rJZAfLGnh464EtdEey+4lRegy8myfkubVETmuexPZWTz9YnKupPVQP+7Ha9qeJmISxNHy+6EAS9NbqPRpyz93cg4B9SqAt6QJZzNSzm8U3+WDOfLtWVePkp9PVAWriBkhfqwXxCewh/V8cj2jJ8U/cq3lEzuqyN93xhLbwWBP+WD/Kf6a8b1Z83HHISYzDoRwlnxwd1ofeRAHYfyVj9NzNMMtlj9pST/u6x7L0glzVp/sEyWPRikniOh6PraIWPu/9x0/huxyZfeH3OcoTLjIT3vJt9dU/PNQ+FA3dsGqkBp5GSZ26RrxcZxh+a9y+bA8k+BSq5Z8kICR+0VCp+UnOX6A054uTY4nMI7x0zFOaG81mJVhJ142ZiSjy+K0Bc9+eaoI1c307Gk8EePs95pbXgjAr3zH/USsYOj/6jRdZENDjqXnytmHYjpwVmN8pTYzxP/1qDTDIRsr90KAgJ4k1vCygHsB0yPriehbOfJ8oFRMb8p1ECHcQwWruEj28bg7xCfhdSP/2WrOgIkzWtvHtE7HBF/GMQ7/LXo5PsqGnzEiQbYX8oReCm4+QdiTMI7s7UWsv0m2V9KzrOYGnVgXjbJtdRWtqVTQEJWvkJ3/66KA02vl4/2CWHK7iMVid7jci3Fgz5X36b3jvWV7PsyU+ywPeD5HW8fY4lwlFVoX2bi+KNmeu7/40qnHhJV4Pi6/T3S05Xq4pZf8Huhrcp6ACehtVcEqDmvJi5lq6MPxlWQd0LMCfAReU7E6jzwcjuk2HybNxeaAYzwzoongQMKBGja0Zch2u/Z/SCwjP7uTjUXzN202Czk+gukmfzvgHAgJHE24GVan0kR76uN3MbFkazBhE5+Vd2bjWQ0pES0wkdztIiiPicXzA7E0fmKl/YM+fLhjLMvMY7WI31KfiHjX9zvPH5Dm22FkF3dNWxXhPN/xl4v4PoCJrfKzl5TJh8m96EYM07ECJpbtPEnzhIB3pIK1AakRgbqMbIDdMfIzLId4rZOmC5jeo7Hyko+zfFLNZIdHbCM16zbygwjOBKtp2I6J10H8C89LzWuL3nNke72+b/l4Jkuz51zrAz8N46xtkm3DrVpzAsahbfuG2sk6aC+0ROso68N7XCxL74N8Wfwgh8i1LpF8z7bSnWdZBl5PWzWmiz1iXXOMvAdP9G+0rIFj5V1MkZ9cfBMTt/SeWEXfEktkqTyzqZLWldLcuUuah15FdIr4m94Ra+VIyyJ7Viy2Y+nZ/e/nIkwIxbete9jbekdYzWuvR2+pVS7/IZXYIQE+teesiuuT1rE8/8fJhp/4OTsP68qreP8n4r8/2Xi5kmQozDh6vpjaCamNvbFbcallHyU7fMHPwXSPl1mMcRbfKh/GPlbT8Btirl8gNXOHfLTDMDFY90jBvVwKbUysiwZMt/8ZVo1+oYiTxwqpcX8shf6nlt/nNRGcKRinviP3WSbpP0v38IwjfVZUq/hITqN7gOWl8iH6Q0A65IP+nW/7XZiIbc+iWYtxIH9R8ny35fvrFGvidrn2L+V9pMUCPUsEhYqIwwvTNmVqeZm3gkuD5PlP8rGD6TH7Nsahb/O0PJs2sSK83sMFcr/PiKC+blUyD8l99KWpfx5mdgOvguuU8vaA77gnyI5LXCj/7yz3fg4mwNXPJvI+hmM6AiaJ9XQT4bPYjpGy+K8++KGusHx6L4vYLhjIb3jirHdUsPpBvVg+LXSPU4lLDbOOHA5fTJDhUeJreJpsVHeT1NQTpQA+LuLkYiKe7SZPWrbVi1Ct8OWjUfJgBzluL4I5CtMF/rA0NT4rH4q3zl6LZdFUiU/DtbZVB9z7Dpg4nUbMNCK/DnkGozGBtNPk/FfkI18X4tM6Wj7EuAjln3zW+jGyvxUTOuJZabuK5dou4vWJ9RYgWI5YEX+jZ3f+RBGt7aU5aPeujZfn9rJUUnZYxrEiWPeT/4Klx4lvbK5cz7+ixPZSqayUd1Zj+dHe6iXtWhHA7SRfd5Md2hXWmrhYyugrvaQ9FdNr+YxUwgOOCpay0REgWKXGT6TZeatYzhsNhRAsjcNSlPXQW7Jxd7/Tx6GCpSjFzMGYzo83yA50VlSwFKUoOc2yrjL6OFSwFKVY2YJsL+ZMfRwqWIpSrFRjAk/BhDHM00eigqUoxUY5Jn7tJUzYSAIzF9gTmIDhOn1Eg4su86UofSeBCRp9HBN3l8RE/4+X3136iFSwFKVYcAmOWtcmoTYJFUVRVLAURVHBUhRFUcFSFEVRwVIURQVLURRFBUtRFBUsRVEUFSxFURQVLEVRVLAURVFUsBRFUVSwFEVRwVIURVHBUhRFUcFSFEUFS1EURQVLURRFBUtRFBUsRVEUFSxFURQVLEVRVLAURVFUsBRFUVSwlGIm7jjURiNkcPVhKCpYSnGzNp1hSTJFQ1mctKuipahgKUXOUR/M5c22dTRXVqhoKSpYSnGzPJVij/99wGtt7TSXl6toKSpYSvE3Dfd9dzYvtrfTXFVJ3HFUuBQVLKV4WZ1Oc/yH83mwZSWN8RjNVZWMK4tTGXFIq3YpgOMWqBZzHEefvhLKZ+pqiDpwQF0N540aQQRYmkgS7Ue5cYGY41AVibAukyHpumjpW38mznpHBUtR/GxeUc6z06YyprycBZ2d9LXIOg6kXZeR8ThRHN7t7KS5vIy6WAwvkQwuixJJUq42N1SwVLCUAWKLinK+M24UhzTUUROJsCSZojOT6WFxuYADjInHSbgZKiIO/13XyVULlzGzdTUzGoexT101rak0nRmXhliEU5uG05VxaUtniGixVMFSwVIGih2qKrloVBMnNA2jLBolnU7TmkqzNp0m4jhEgVHxOK+2d3DlwqXM7uqiPWNivcI4f2Qjt06ZyPKuBG2ZjFpaKlgqWMrAsndtDThwcF0t541qIu5AMuNSV1nOzR8v4aJ5C/NK77xRTdzWPEFFSwVLBUsZXKZXVvDE5lNYm85w7eKl3L9iVb9CIs4eMZw7mieyLJmkQ0VLBUsFSxkshsWiALSm0uuVztkjGrmjeTwtyRTtKlpFJ1gxfezKUGB9hcrjzpYVxBy4rXkCTiKpzcMiQwVLUXz8dNkKHAdubZ4I6tNSwVKUYue2pStIZODO5vG42jxUwVKUYueulhW4uNzVPAEnmVJLSwVLUYqbu1tWEnMcfjZlAk5XkrUaXKqCpSjFzO3LVhDF4dYpE3DVp6WCpSjFzm3LlpN0M9zRPAGSKToyGX0oBUArCkXpI3e2rOTsOQuoiUSYWF5GeUTn7FLBUpQi5q6WlWz39vvcvKSFaidCc2UFVZEIKRWuDYJGuitKP5lSXs6FIxs5Y1QjtbEYK7sSRHop1xGgI5Oh03VL3lrQoTmKUpLCVcZlY0dyUH0tK3uJuE+4LpPKynCg5HscVbAUpUSJOw6VjkNvrvi2TIbDG+qYuelk2tMZVqZS/ZpFVQVLBUtRNhhHD6tn5qaTwHFYnkixNp0uOeEqhGCp011RCsDvW1ez2ZvvcfPiFiqjUZorK6iLRon1wUrbmFELS1EKzCbl5Vw6diT71FXTFItTG4uaOecdhxWJJGuK1PrSJqGibKTEHIeU6zKjcRjTK8tZk86wJp3hrBHD2aqygnmJBLEi+2ZUsBRF6caEsjL+MW0Kk8rKmNtVXKKlPixlqLAz8Hl9DOvPgkSC/d6dzbxEkinl5Rt9ZL0KljIYbA0cpI9hYJjTleCAdz9iXiJBc3UlZY5DufVT4TjEHIeNQcpUsJTBYB2wRh/DwPFRV4J93v2Iu5csB0wAapf8tGUyVEUiVEUiQ94C09kalMFCB9cNMHO7Epw392O+F491e7hLkymOGVbPA5tMosxxSjoYVQVLUYYQSddlQSLZY/tvV67C+RB+s+lkXGBVKj0kJxrUJqGiDBEeWLmKz38wl7pYlPpYhMwQtHFVsBRlCPG7las47oO51EWjNMQiQy5qXgVLUYYYv29dzYkfzacmGmVyWRkTy8qoHSJzdqkPS1GGIA+tXMXrHR1cMnoko+MxNq+sYPPqSkiXts2lgqUoQ5QPOhOcM/djALasrGDn6krWDqBgPayCpSjKYPDOuk7eWddZ8vehPixFUVSwFEVRVLAURVHBUpQBxNGypahgKaVCGujSx6AMNNpLqAwGHwKL9DEoKlhKsXME8BlgW+DfwKX6SBRtEirFSB2wHLgYM+PotsAm+liUgULndC/x9yeVTrpI8jMCM9too+RpPPA+8KQ+q6FHIbRDLazS5lPAUUWUnw5gNRAFdgDOAS4rkrx9psielaIW1kbHaLFq/luk+TsS+CqwN4WfgXSKWFfztNiohaUUjglFnLcKiqdjZ6FYfZVaZEoXFazSZgnQDOxUpPn7GHiV4pjfvQvYHhipxaZ00bCG0n53ewJHA1UiDIVmU4zDvVYsmSnAHMlfRwHzVQXsB8wAVgI3afFRC0vZsJQD5wM1mGW1igGvJy4CxDH+ot2AWQVuutYAXwLagFVadEoY13UL8qOsN2XAAcC5YtEUM1eJhfW5Aj6rw4AzgWotOqWrHSpYpUsVMBy4G/hrCeT3c9Ic+3qBntVI4B7gj1p0SlewNKyh9KkF/g5cBDy/ga4ZxYRTRKHbwiz+wuRKMzENtGCWrz8U+EaBmrGTgMcwUfjvaNFZf8Ha0KjTvfRpF9/Mhiw9aRHK8UBKfhqAsZKPdozzfRKQlONHAp3AdOBC4IYCPKtV0jQdpYJVmqhglT6OiMSGru4+kB87HzERr+GYXsLlYoW5sm8NpofumAIJVkzyk9RiU5poL+EQsMwpjgnzXBECV6yoT4tF1S5WzRo57k6xtrYokLhrmVcLSymwhbVWxKFYmJWjbL0rv7ex/t6QoprRIlPChV2d7kOCbTH+GW/g8WCIIpJ+X5pTZcCBwFNAImD/vSIcp8n/1RifWFp+aoBh0ry08+D5w/yFJ0mww9/La1QsvVWYkQFLKGwg69Aw7dXprvSDg4DvycdYFmBBREQ0WjG+pZj1cUfIBlI25LA+4hif1PnAy9b2KGbCvueBZbKtHPgh8FlM7JPn3B6OmTFhJvA6cJavHFaSdeBXS36Skse1IjBbSDopsr67VmCyNDM9gcrIsxgnaXdghi89Q/HMHqGohTWkaRDL42Pf9puAxcBPMLM3+EnI9q0x8VpxEQEXM75uNxGt10QMwkQrItfxhyNsiYmvWmJtOwsz8PkXYtl47CDXmQ78SsRufh/ufazc+/sB+z4lYjlPRM/rgIhg4q8imJCKk4FrgWlk/WnIs1lVZE1qtbByXVQDR0uCLTExTDaTMMGQFX04/xbgxJDm5J3SBOsPlwAnWP+PFHH4hqTtUQlcB+wq/38EnN7Ha2yKiZ/aLGDfscDP+5jObEy8ms0xYokpJaAd2mNSOnwoAjXG2ra9bO+LdfA2wUNj3sAMUj48x7lbEzzLwTjZ7llRBwOnAP8Cbge+BVwt+2rkJy7/v2YJ0BbSrAvjA7GU9gzY9zfgEPo2Y8VMYH/ftloVLFVJtbAGh0t9H9yF0qTrC1thJtILYndgYo5zjxZ/VK4m20nAvvL/pzEzIwBcjuk1/IzvnFPFl4Vc++xe8r+bCLafchGshj48g52ApZiAV4+TMJMMKmphKQNdRoBdrKbXOuA/OY4fZzX13gb+IX83yo/Hv8SXNB6oD0hnpfifwq6xBfC4WDu7SNozgPswA58vE5/V963z/is+pka59taY4T42wy1xeYHsbKFlmN4+xA/3F/FDNYp4hvEqZrobWxw/CmlqKqqSamH1k5HArRin90zZtl0vVg/ABSFW1ZEhzcOLxDqyqQeew8zYWRdwTo1YOWBWyLFXybkX+Kf8fQSmt84Ou3gBOAM4TsT4hAD/0hdDfFrfDPFnndbLM/kOZuyld78vyXMdpcVMLSxlYMhgYqB+BFxvWR+v96EZeFbA9smYUAi/NbVtwPEpOfYAgmOX2siu8vyh/GA1B6diHO6tAedejFm78E1pMj7m21+HmT5njG97FNOBcKRve5WIdK65t34uzctPi8X2rFxjjRaz4kcFqzRYLpbVTpYVsojeJ6O7FeNQb/JtvwkTs+R3QN8mzSN7fq20COauIc3FXHSIUMVD9r+MidMqAzYXcbO5RwRxZ9/2d0Xo9vBt/5U8lyNz5GkB8AURqCelWX1eP+5NUcFScvAa8JBYTd5H29YHwVhHcGzVCnpGjLcHHN8pH/c1mF7JfKgkGwCai3cxIQ6nBuxrITjAeUWO+yrr5XozMT69dZhwjwa0p7Ak0Ej30qKF/OaRyoh1Ewt592UBx5cFHP8/TGBovtG+a4DfSp7LcxyXpPvMD37RC7puBcEzVERyWHRBrJTnGtfipYKlDPz7yscqXgc8Qfdoc4+nMT1kNm1yfGfAdaPkP4XNGkxgKRin/bU50oiF7Ps7wWsJhq3G8wJ9i563iWrRUsFSBod8rJxl0pQLImg+qkUiKkFWSzXhEfXlmNCGCZjOgCrMkKAmOfc/mGFBuSbNqw5pyt0ccvxvQrbf3o/nGaE4liJTVLCUAaADuDFEcBqBveTvdzC9meWY3sUoxpm+L8Y/dZU0L4O4l959coOFilWp1NY6+LmkqMcERr4vVoHTS9PGm089GfKRru/Lr8NEyb8pTb5cfAEzVOduTLR5meSvXJqsj9A9bMLzRbm+bY7v/pJkZ2/wyHfOq62kGblWi1geKl8A7VDBKk02xcw60GV9oI40yapFpJDfXjS5LVBpTAR8jfVxZ8TiHiHCMF4E5vEc+Rgm57T0Md8nY9YHXCFCM5zs/FSHkZ2iBmlO7iJ5dUWUGjGzK3j3503HXCd/e/fnNUu9c2OSnrdoRkaat5thovPP0CKlgqWCNXDEMUNX/odxiEcIdhT7HfLeZHgjAgSrUSy2tE+wRks6NZgI9/4s1rCJpDc7j3O+L5bjfZb1FAuwGO2Ck5R7a/AJ1ghLuL2e0lGWYHlC3ozpnXyY4lmMVgWrt4vq0JyipxbjJB+xga97ilhY+fRMfh74LmZIziNi7fSF9zGBqxua8SLKU7WYFb92aOBoiZQNTK+brfQ1YskERWgPl33VIR/oRHrGHZXJOSMsK2aYWCG2NTdCjqsKSDuGCTe4EjgeM+voGSH521TuwWMN3X1tEzBDiMoCrMjJmEBPv5VZJXkLEskRIkpVAdbrZDQOqyRQwSod/I7kBGZM3D8xw29s1mHG2j1Bz4DNGGbIzg9921OSzp/IDqpOy3UyvmbYV+g57s9Lw2sGLsZEsNeE3MtJmFiwSI6y+VOyYyftcxsw0epfDmgCb4+ZlWKrgLydA/xZi5IKlrLhScjH10DP2ULXYcbJjQsQrLkYX1hzgBA8JYI0Msd1V2FmOJjYhzyWEbwIxSoRlTGEB23OE/9S0HQxszAOev++Lrnv6gChbMU42CejgaIqWErB3l8XwWELEYyDPpWjiRlE0Ao0QWK5vouRJuQnVxlMhuTf25cOsfI6Q9J1CB9bqahgKRugmVhBcIR4BjMOLyg4OEr42L5yeo+mL6f3AcZg/EVVOdIo70U8ygj3LZWHWEreCjyZEKGuVAurdNFI99LGxfRwBQU8dsm+IEtoSQ7B+oDguatsWujbIqjPEh7ZvirHPo+Pycaa+ZlN95V6bMvrnZDzOmRfSotOqZZ4DWsoBWowk+g1hVjJTp4WtNPLOd6+CzFR7EER9OtrnfvTeBUzT1dfr+P08779+5rJrnmoFLl2qIU1NJqF+e5z+5meff761jp9SSPXMW4/71trS20SKson1GFCKiZgAkEX6SNRBgp1upc2W9F90Qe7Ito5pAnZJPuCHM9b0jOmK6jM7ETwwqsRTLBoBjgQM63MmIDjopgVmxt7Eb4dQyrVCZjVo4PYjuA1Dmvkviu12KhgKYXhFOAZeq7J52ICQ+8P+difwvin/MwAng8ROo8ysZx+H7CvAhMMeqcIUgKzSo2fcsyCGg/luE4NJjj1qoB922Lmgw9a+edMyYM/yr8W+AM9A1EVFSxlA/EdjCN5F9/2NGamhS3ouTTX65iVY/YNSW8OuR3QnZgOgKBhPx2YmRg8WkIsmg5JYxPCwxYWYZzw4wP2/VmEeq+AfVdKmnaku4OJvP8/ekbAKypYygaiAxMeENS8S2OCJNMhohPUtZ8UweltXN1KzNi/yHrmvbOXNJYTHtawjmAHeofkLeqzOMGEf3RqsVHBUgqDQ+651sN6xXKdE6P3nrQo/Zvj3Z/3iO//oOZnrtAFN8czIcczUVSwlEEWpqCP16HnrJz2hxkPeccRwnuIbSHyjgua2XR950GPyU/GStPpRdT854fdWzxH3jTKXQVLGWRcacr4P8KMNJnCrJAugmOSwqZNxtdU9I5zA85P0/sQnlxxT0m6jyUMCn/IkP9YwkyOZiRolHuJfwka6V4qFcvoEKvIv1KzR5XsC6qURgOTQq7VTHamgyZJwy9M1fQe/gBmzquwZeOrMQtUeGlvi5lV1aaRYKc7kv/RIc9qM4LHMNbRM+RBI91LSDt0imRlY6cZswr0DvRtfKRiCdaGRiPdS5PRYi0kMXNCNVhNHW9u9gkYv1fGasbVyHkZX7Otge4zHGTkQ74ZE7NVgQkArcbMseWtxhOV61RY1x9GdhaGFGZG1Hr5Oy1p1JNdDKJOtp+K6aEcJ3kZ7TtvpFh8Keu8aiudGrJz1Ges63jN1yrJm9eUHQbcg1mq/mpMj6RS5KhglQZlwAXAr+TDWo4JLQCzZFaQAzzua8ql5CNt9Pl+XBED/2o7ozGxS4hP6GO5zpyQ67jy2ws6TYhwjZJrenNbNcgx3mIQtSJQru9+FvnuK0q2BzND90U00pJuo+9/T+BSInCjLAEcb+Xhai1i2g5VH9bAUQ08kMOfM1iciIkOz7dzZjPyX9ThQeCbBXi24zBR881azIpfO7SXsDQI6pWrAD4NHE5PB3MtsB9mPJ//HU8GTsDMfW7jiB/neLLO7FGY8YVR33G5HJDHARdjpkB+iuAOgaA0thLx8BgraW0fcP4mcg+bBliinwaODbhuozyr/QLO2Zrw+cGUIkIFq3TplI/sl5hFVW3WYnrx7gn4cFdgxiB+x19hSrPteuAgqxlph0ZshRkD+DzZhSps6jDzvZ8n4rcnZs0/v0VzlQjamb77sZuqS4GzQqyu1cC3gdN92xMi3r+g56DwFSJM96grRAVLKQxviT8rGbJvdcC+tcCLBMcw/RfTUxY2NCcjgvYo8Bt6LgKxBrPkO5hFIv4PMwi6wWfR3Ipx6P+YnqEMtlX5n5B7a5G8Bll6L2AWsKgI2Pe63H9ai44KllJ8hDXfbCc3AU2ksH3/w0xLfD2wEDi0l+t/KAJh52EOxpn/sIjOMTnOj+dofsZzlOlYL89EUcFSCkBvi1BUEDwUZX0XofAsoN6GuZRZzc0gUr1YO/1ZhCIq962LUAxBtC1f2nQAXyW7eCk+S+Zrcoyfh+g57YzHVcBHfRSs3ppWvQlfhtxTMt9P+Ko7P5YmaNAz+Ro9wy+8ZvLX0OE5KlhKQeikp1PbYxnBk+wBvJIjzceL6P5ezrHvmRxWW9h9fyw/ijYJFUVRVLCU8OZWLKTZFSHcT5NrWbAoxeOUjuYon2H5dHLsy/VMFBUsZZApwwRB3kLPWQsqMFHqN9DTaT0G+C5wTkCa22OmJd6lCO5vJMafdmbAvqmSzyMC9u0J3A5M9G2vAs4ArtGio4KlbHi6gFnAkfQcstOBccQfT0+n9UJMMGlQ4OdrIlbTi+D+FmPGPh4YsO99zNQ0e/i2uxjH+mcDRLwNMz7xRNR3q4KlFARvErugsIFUjn3JkO0Zwif2C2p+OX08rr9pJAgPiUjkEPJkSLq5nolSAmhNU9q4wHtiPQR9uO8RHikeFi4wB7OwhVc+vFiudECTtLfxdw4m7imsnMXJRqQHHbeY8NCJ+Zie0CBRep/gWUc75JlopHvJlnidraEUqMTEJE3YwNfdGfhSiLVyLma8YC42AS4ieJgMmDmw9pS/z6LnwOQNgc44WkLaoRZWabBOfDJPAQvI9vRlgHbLOnEtyyYl51XTfV4pBxO/lREryw2wQuKYmRAuxDiwbwAOwAwgbgT+KUL0ecwah630DAAdg1kj8CcYB/leZOfwGoYZlnMqxmf2BMaBPkbS9gJKOyR//nw6si8iYmjfW9gziUgzspPsFNBJzJxZcXT5L20SKgPKj4G9CV6MYjCYE3OcpVEg4bpvuaasrMU47N+OOw4ZWJh23WelSerP0zAHlsQdh6TrvumaZpjXdK0B5sUdBxdaU677QpnjZNKu25k2M0FkNlCzzWvq3oKZHUIpcgo2p/vxjcP06RcxK1JpTmpsYO+6aq5b1MLCZJLqSAQXWJfJ8H9jRjCro5M/ta5hWKxneFNHJsP4sjinNg3jFy2tLE4mqYxk+3haU2m+OqaJhYkk9y5fxfUTRvPc2naeWdNGQ1TDpUqBB1e0bjyCxS7b6RvPD38TZ9DpzGTocl1qo9Ee3clt6TRxx6E8Et7RnAHa02mqA84HaM9kzEjlaJS2VIqySISywi1O0o72HubHS7M2nibh/K6EvvD8uAcTO7XBmy6rU+vXOmvt7fykNxa5IJ13FRh/2F4Er42ohDCxANdUH1bpMA7jfNa5xweevkyVoxQBGjhaOmT0ESgqWIqiKCpYiqIoKliKoqhgKYqiqGApiqKoYCmKooKlKIqigqUoiqKCpSiKCpaiKIoKlqIoigqWoigqWIqiKCpYiqIoKliKoqhgKYqiqGApiqKoYCmKooKlKIqigqUoiqKCpSiKCpaiKIoKlqIoigqWoigqWIqiKCpYiqIoKliKoqhgKYqiqGApiqKCpSiKooKlKIqigqUoigqWoiiKCpaiKIoKlqIoKliKoigqWIqiKCpYiqKoYCmKoqhgKYqiqGApiqKCpSiKooKlKIqigqUoigqWoiiKCpaiKIoKlqIoKliKoigqWIqiKCpYiqKoYCmKoqhgKYqiqGApiqKCpSiKooKlKIqigqUoigqWoiiKCpaiKCpYiqIoKliKoigqWIqiqGApiqKoYCmKoqhgKYqigqUoiqKCpSiKooKlKIoKlqIoigqWoiiKCpaiKCpYiqIoKliKoigqWIqiqGApiqKoYCmKoqhgKYqigqUoiqKCpSiKooKlKIoKlqIoigqWoiiKCpaiKCpYiqIoKliKvitFAYjpIygZ3gemAsv0UQwo5cA6IKmPovhxXNfVp6AoSknw/wMA93duQP8MRygAAAAASUVORK5CYII=</mdui:Logo>
- <mdui:InformationURL xml:lang="en">http://www.fsp.uni-lj.si</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sl">http://www.fsp.uni-lj.si</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>Fakulteta za sport, ponudnik storitve moodle</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=Fakulteta za sport\, ponudnik storitve moodle,L=Ljubljana,C=SI</ds:X509SubjectName>
- <ds:X509Certificate>MIIFfzCCA2egAwIBAgIFLuUK5icwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTE1MDMGA1UEAwwsRmFrdWx0ZXRhIHphIHNwb3J0LCBwb251ZG5payBzdG9yaXR2ZSBtb29kbGUwHhcNMTQxMTE5MDk1MzQ2WhcNMTYxMTA4MDk1MzQ2WjBYMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMTUwMwYDVQQDDCxGYWt1bHRldGEgemEgc3BvcnQsIHBvbnVkbmlrIHN0b3JpdHZlIG1vb2RsZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALK3QSuPOg4kuzt6vH1kcUEDI1Szreg9eMDIDlJ3JD4XJjJZFdgMl4HTp96zQh/AQrLF9Z2DCIqe1/eeG9aufBU7TKS1g2y7kUj53NF9d5xjgts/xlkRXb962CD3UugwcPsJScR3CiWlnFpRWw7vSBYBo/yaN6/TR7LG1195J360HuAx02E6HcqlteHc7n4QujHraB/arafCwIRDt9H3kmhiiRaW2QnlQxi7NVIOspGDtQhjMZs/+Hfb/RGiVEnFSVKl43lELHDa+hXMwnkWZfpWfnAaRku96FXLkxo4ycRKrdr5v5lSRbFQ47B3yhemt7R3deqmTHimTaUjsM6rztbXir12hDlk2OBqFXnrgl5kx/aRpgVLODOkmSOrpT8I7SkVHKXmDGUIY62RVRcYenlGixeH8JM2wuTba77mluaesea+OgDW0CDINXy4qVxxGg5rPXZvQNC9eRQzWPk9YAksk/tndSQPHM53AREm95ov5vQUP0mu+Z/J37pzCTwPrj4/luZka9Nkhqy9hDljnXyWqjagXJqhcJMm5PjinfCveoiwri1YPD1CJlRnLQiuaMoJVv6PRfwkqDMQp6pYbwohyRkiTJt9X/TYilmrjLenacBD90ByCdKd/1LUUcy1wlxKmzISPwCJZpQdCC1d0FwxI+jX0yYd/++vW3wa01fVAgMBAAGjUDBOMB0GA1UdDgQWBBTCOuEP6Bdx8zqqRkiGioMWbutLsDAfBgNVHSMEGDAWgBTCOuEP6Bdx8zqqRkiGioMWbutLsDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQARjG6usg8fOKQQCjEoV29JapGhXNnFT2UmbTUvZyyyjGUVonJ0kSd++gBm7JgO6C5xRrVkgWstRBopdNqeeu8INwzWQHuMIhD7+skvRGiCC6VDP+BEquS5zYOPcg9MZwDk4Nbt5jTaMOV/6wNUaArT32kHuc1X1tgVYFXvL4x0/qCtjaKEIi7PeWuwcTmr4ODvLhKPUi/5sKTrQioJWErETN3RGR5xCMdvu3ij6YnnY4o11xDlbsG+zTjzZotrbMEtMDpsZvFtLP7kocmbyJBVzIU+IwWmFxeKjJO80OCDY3lbvYiJ75uhl85HOyM8uauafnqTU4YQ2Eitf94+JsZI2d7faCLez4vaT/cBsdbtPpEeBcMkMh3eMdNIJ9HsFejeGesfllgivvbVzy+B0WFEPEQag1QnTmeu0CKVqlF9ShTziTO7ulowIbbbH9ZWw6IVl0APTMLjDBfTlMNfHea8xyC/kU5HiIPgZyg1G0yv5k2goaMzPCNs78/SIoKd6E91rsKVHnGEDF1xi1N8YqwzD5rG9SsPunioqOz0ISw83bV60yZtxv7tMO0htxZLMuZ+M/Im2CPbDhLB03r2a9CX6eILGGXjFvIEFKv2MbiXYr1Jopl/6ZvS2YuzzT8/8UfOYaqBG5uuSS7X1ZCa1rAMrEf6QbyDSoIMTwgeDel6Lg==</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://moodle.fsp.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UL - Faculty of Sports</md:ServiceName>
- <md:ServiceName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:ServiceName>
- <md:ServiceDescription xml:lang="en">FSP Moodle</md:ServiceDescription>
- <md:ServiceDescription xml:lang="sl">FSP Moodle</md:ServiceDescription>
- <md:RequestedAttribute Name="sn"/>
- <md:RequestedAttribute Name="givenName"/>
- <md:RequestedAttribute Name="mail"/>
- <md:RequestedAttribute Name="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Univerza v Ljubljani Fakulteta za šport</md:OrganizationName>
- <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Fakulteta za šport</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.fsp.uni-lj.si</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sl">http://www.fsp.uni-lj.si</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Milan</md:GivenName>
- <md:SurName>Žvan</md:SurName>
- <md:EmailAddress>mailto:dekanat@fsp.uni-lj.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Helpdesk</md:GivenName>
- <md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>mailto:rc@fsp.uni-lj.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Matej</md:GivenName>
- <md:SurName>Lekše</md:SurName>
- <md:EmailAddress>mailto:matej.lekse@fsp.uni-lj.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Matej</md:GivenName>
- <md:SurName>Lekše</md:SurName>
- <md:EmailAddress>mailto:milan.zvan@fsp.uni-lj.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Advant</md:GivenName>
- <md:SurName>Advant</md:SurName>
- <md:EmailAddress>mailto:metod.skufca@advant.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Matej</md:GivenName>
- <md:SurName>Lekše</md:SurName>
- <md:EmailAddress>mailto:matej.lekse@fsp.uni-lj.si</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index cf558882..00000000
--- a/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://my.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School Intranet" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-09T08:52:26Z"/>
- </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://my.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9DCCAdygAwIBAgIJAJVRvogczC70MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
- BAMTD215LnNicy5veC5hYy51azAeFw0xMzA0MDUxODIxMzFaFw0yMzA0MDMxODIx
- MzFaMBoxGDAWBgNVBAMTD215LnNicy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAOFMWOnq7etNEDgCmE/lKHlcRvPpQph0V4Zf2G9zNixO
- ZeHhw5ZSSQVtMSj+3Yyfnl1RVFdlux0YHe/0uVk670Duqs+i3ulxTVWo4MXv5iq7
- xbnBuiK4mez3+MDPE49LR5Txz+MiHUsbIVmcZcIksxPWgyZuD4d/d4MtpYqwpk99
- WoD55Ng9GOae2bBZnS26qPAKp0aDG7pV6NvQ2dXuqpZMi/+8j+UiemP2aDyjIvF0
- xu/8/1kIX2QsTn6+/A6qfJd+byEkUef1/Q8HHmTka3b10NbiGzJFXXyvWvyCyPVA
- tDIMj/jOfziE0z9VFqpZkbrbJfpgshYpUEN2mf85tvsCAwEAAaM9MDswGgYDVR0R
- BBMwEYIPbXkuc2JzLm94LmFjLnVrMB0GA1UdDgQWBBQ32HmqAoYtyy9Syo+ReOhH
- Uh5bQzANBgkqhkiG9w0BAQUFAAOCAQEAhwjVQiw60XvGioiZEAtJn88u3X9lkkuQ
- MTDQoZt1OIXu5gPJe/W5LmiWLjcTVrFLRwQQndTjki/HKkyU0U6HCIvRaqW4M/ac
- KDIDFuCQugN5b7kHGdG5ak78bGzGvaZSuNcZqG+QtfA5rxhqtYcmyin9+S4xDaJk
- nXlI0zEE1GXi6UVPNu6WQDYniwSK5EQ53ZrO/shYSX04+mbfkZCnIdOLpQZbQy/K
- AYcgSvCKfLTGV/yTREOHBqv8AXsIk85z9io8dztQliPAu5qvUz+nNpjZuV4z5/HG
- JAQyJQOynWStb4SGfCYSIs0ujtdolEQkpG3EPehVm2fslcYEveqUHQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 2b726150..00000000
--- a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naxos.queens.ox.ac.uk/shibboleth">
- <!--
- This is a "Naxos Music Site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-22T15:10:00Z">
- <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://naxos.queens.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJAL977jDe7lTRMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGhvb3QucXVlZW5zLm94LmFjLnVrMB4XDTExMDkxOTE0MzgwNVoXDTIxMDkx
- NjE0MzgwNVowHzEdMBsGA1UEAxMUaG9vdC5xdWVlbnMub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUf1Kw2V+k8E3SpgVw20dkkKaTgreb
- cEaSH9iWBFQwX7kSmLRTgABVGVb80BK44pJ5ob0Fi0N5yC6ZftuAVst2p4CEVege
- APdglPc5cY49vWQs6P12qaYUe9T/USrpJsWBC2h6Q4yfF4ZpKqZ+S6roCjx0RN+Z
- Nt/E/v1YhBOWxzDS1XLFkIh7bmkZMXiwEQHIJ8eHvyAHaDPJ+FBEsQBgwFozHD5D
- OBwCKfu9MC1XkzitnSK7VmKCTKQNMpCjKzHlvv/YAu3+Gpc1+IFZsmFvm3ClMUwO
- bft0pv0h6LvlOpfsYHdK79DezjOFIC1ErI9GT3jtzq0XAAP7S6AtXwOXAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFGhvb3QucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQWBBSB
- 1rkdpl832bWJL72XQwzSvahSpDANBgkqhkiG9w0BAQUFAAOCAQEAReq3JOhtVKTQ
- mtSaPD5CCtKYphLumrMiGEc3ANhlnxqbi3sjcGKemaj7vKt1XvpGiIYioMLa5Vhh
- +48n4V4dwaCPYmwORCo/sQMdyQ5bUEAONX0kqsdY23fOLfdm8EBdNYEVWoVHgWPb
- meJXz3xzYE+vlimyl5qbv1nVYZo/y8U5cclOUJ2mnrUILpTqaKlm6D94xMVtvJ0d
- wPg715M2n27ESKdvOZHoH25/GASFleHihcIxhKTq2AFHr+G1OjzuSBS0/SZbkvub
- pce4A1Yh2scVlAkDZTwf4fSnjM5RVNvhl8LGJvgDzWwJOYXIRYnSmkY93lliTvSz
- aAJiV4ZfqQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Naxos Music Site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Queen's College IT Support</GivenName>
- <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Queen's College IT Support</GivenName>
- <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index 638488a7..00000000
--- a/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neiss.nesc.gla.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2.2.3 SP 'NeISS Portal' for NeSC (Glasgow).
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJAP+u9FsUkGK4MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDcyMzEzNDkyNFoXDTE5MDcy
- MTEzNDkyNFowHzEdMBsGA1UEAxMUbmVpc3MubmVzYy5nbGEuYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnRKUYCtTm/YAA/xOx01gsbodauTrk
- 3UupsTSRFJMucsSFwl0oHTNFXjXacGxSEhq1nwRw3W+aKaaxOsbRqLRPd9TFCo1r
- SZLU5N3+S3NSfesZnrKLxcDb5XJf4ToqBCwHwu8bSwMC9g3LOZvm31lxaBu7lRhO
- 2qPlxx8ESD6xJNU+c7ijTfBCwGnm7zH30oTsbspFTPfGHPp2DpmG42SWJZxgJYyv
- hx4No30U+MssN9O3g9bcLm837aIEzVJDDBamQA83oBkBUYTgHYo21qfMezYDBXaU
- IlRFNZt5eHu+nbW+wGuBQDa3P8ffDVGzXwNcIntYZXpjAww3DaC8JFjxAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBTb
- Qzadk9TtnjjvYEry7dZ8XQ4MeDANBgkqhkiG9w0BAQUFAAOCAQEAWYIBYcDCXnr1
- OTz0D8hx4aJRlPAouoAtc5+UUMIu9FCII/DqyMljxynRR7psCi8xk4bJ0Mk1cg7i
- EhwKWmRxUaL92m1ebHb4eisdleGnnMeO89Gn1kGA1QplNvsJZP8UBqzf5pQshe8K
- K9F6pn8/3FE3JpEeNlNBz597gxTM99FIUUvSR8bllqljPaSOEBgbNEHdrgd5qGBt
- nzxUn0XdIcnfDxTTYkF7ht34kwNAVJ16q6bz5FFIaxLFy7ZkwbCvm23tN5KDYUjo
- Re0suMUuwA9QTypNllFOEaKQvLOuxyE/vtnrNN/NV0jRqCCQ1ycWU6bRleT7xMpF
- sLv7XXQhLg==
- </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>
- MIIDAzCCAeugAwIBAgIJAP+u9FsUkGK4MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDcyMzEzNDkyNFoXDTE5MDcy
- MTEzNDkyNFowHzEdMBsGA1UEAxMUbmVpc3MubmVzYy5nbGEuYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnRKUYCtTm/YAA/xOx01gsbodauTrk
- 3UupsTSRFJMucsSFwl0oHTNFXjXacGxSEhq1nwRw3W+aKaaxOsbRqLRPd9TFCo1r
- SZLU5N3+S3NSfesZnrKLxcDb5XJf4ToqBCwHwu8bSwMC9g3LOZvm31lxaBu7lRhO
- 2qPlxx8ESD6xJNU+c7ijTfBCwGnm7zH30oTsbspFTPfGHPp2DpmG42SWJZxgJYyv
- hx4No30U+MssN9O3g9bcLm837aIEzVJDDBamQA83oBkBUYTgHYo21qfMezYDBXaU
- IlRFNZt5eHu+nbW+wGuBQDa3P8ffDVGzXwNcIntYZXpjAww3DaC8JFjxAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBTb
- Qzadk9TtnjjvYEry7dZ8XQ4MeDANBgkqhkiG9w0BAQUFAAOCAQEAWYIBYcDCXnr1
- OTz0D8hx4aJRlPAouoAtc5+UUMIu9FCII/DqyMljxynRR7psCi8xk4bJ0Mk1cg7i
- EhwKWmRxUaL92m1ebHb4eisdleGnnMeO89Gn1kGA1QplNvsJZP8UBqzf5pQshe8K
- K9F6pn8/3FE3JpEeNlNBz597gxTM99FIUUvSR8bllqljPaSOEBgbNEHdrgd5qGBt
- nzxUn0XdIcnfDxTTYkF7ht34kwNAVJ16q6bz5FFIaxLFy7ZkwbCvm23tN5KDYUjo
- Re0suMUuwA9QTypNllFOEaKQvLOuxyE/vtnrNN/NV0jRqCCQ1ycWU6bRleT7xMpF
- sLv7XXQhLg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
- <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): NeISS Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.neiss.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>Watt</SurName>
- <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 20d69555..00000000
--- a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://netauth.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College NAC" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-10-02T13:03:24Z">
- <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://netauth.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJAKMSnZeSVHgEMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFG5ldGF1dGgubmV3Lm94LmFjLnVrMB4XDTEzMDkzMDE1MzQ0N1oXDTIzMDky
- ODE1MzQ0N1owHzEdMBsGA1UEAxMUbmV0YXV0aC5uZXcub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC035v936htfmoVzstmJwIfPvfUB2qE
- wey1wBMBuucw69i5g4yl8YZ17yklNQAXs3aLxiTUhLoLVZ8OK5vc4/z5PCrnIQbj
- eO9ll6jwn6svf2NRiK5L6rDGgxjrbCjz7W7azQefCW9UF6HApFLY2GJOrZxYhnFW
- RTiQIN5SrZxBqMNi780uPw88Qchm/8+B3E941F9Dh61Gp/DQHsORQWgEy5RF99Yk
- MGc3wFWFNy0M0e3FHgjRxgNHvbIW5ny1TO1EAZnGfwzV30onyu/OgO/3V3jVb3Bk
- 0S48VDUFi2GTep9fOwmqJbKNy4r3VKBn5eIgVVlnveK/BbF7yIcMgwLrAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFG5ldGF1dGgubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBQa
- NkzluKeibaDUOYUKYis0I+BaDjANBgkqhkiG9w0BAQUFAAOCAQEAUabom1zsaMeN
- Ah+SzTLFnBQAwHWSeJfWnEdtDFavwTenxjyxGMm9T85kvnQK16p0dI7yRxuHR26V
- E6glnUU/XcO13yX2f0vPGtqLzVTK2lDK4BuSErJ+HQAuJxr0fGIHYP5s4U+Fe11l
- wRU+KT7ijBH7IcHy7U/Kt6qKTSF9B3oMQJRvYTszduhik4fM2YCyWOscjvI+MCEd
- 4q3awKar8d4qiAqBFM627qTU+ozjYwV6O3mFPIfi8Kp3GM5+qbVBPgJhlPU6n6Fs
- Fqnx77OlqMFgNDUgKpoXmT1+nh6Fb9/4orNFUp3gAJBvm80LmYl61O+UozUgtg1C
- JBJczVcyrQ==
- </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://netauth.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, New College NAC</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Dore</SurName>
- <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Dore</SurName>
- <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..3a094172
--- /dev/null
+++ b/swamid-interfederations-2.0/netlogin-dev.strath.ac.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://netlogin-dev.strath.ac.uk/idp/shibboleth">
+ <!--
+ This is a "(Dev IdP)" Shibboleth IdP for the University of Strathclyde.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
+ BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
+ MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
+ ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
+ AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
+ AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
+ dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
+ 6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
+ lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
+ xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
+ aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
+ yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
+ UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
+ OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
+ pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
+ AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
+ BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
+ MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
+ ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
+ AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
+ AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
+ dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
+ 6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
+ lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
+ xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
+ aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
+ yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
+ UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
+ OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
+ pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
+ AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Strathclyde</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Strathclyde (Dev IdP)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:ukfed-support@strath.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Technical</GivenName>
+ <EmailAddress>mailto:ukfed-tech@strath.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml
deleted file mode 100644
index d4b8156a..00000000
--- a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nortcoll.ac.uk/oala/metadata">
- <!--
- This is an OpenAthens LA IdP for Bath College.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T10:54:50Z"/>
- </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">nortcoll.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE
- CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s
- bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV
- BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv
- bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab
- MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM
- 6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo
- ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1
- 28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U
- FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M
- kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2
- jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/
- MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK
- zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo
- NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W
- bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL
- CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo
- J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq
- </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>
- MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE
- CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s
- bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV
- BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv
- bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab
- MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM
- 6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo
- ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1
- 28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U
- FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M
- kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2
- jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/
- MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK
- zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo
- NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W
- bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL
- CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo
- J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nortcoll.ac.uk/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nortcoll.ac.uk/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Bath College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Norton Radstock College</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.nortcoll.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Kye</GivenName>
- <SurName>Pearce-Rees</SurName>
- <EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Kye</GivenName>
- <SurName>Pearce-Rees</SurName>
- <EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d8024467..00000000
--- a/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.learning.ox.ac.uk/shibboleth">
- <!--
- This is a "Learning Institute" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T17:02:24Z"/>
- </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://online.learning.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOXHb2XHLXDRMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51azAeFw0xMzAyMTQxMjM5MzJaFw0y
- MzAyMTIxMjM5MzJaMCMxITAfBgNVBAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiPgk2FpHiAr7rihXV6
- Se87QZa1C0IvcZsWRo14htlX8pOGA0SS35HDw/XYohB+JiCsuRTw3G++/8MDRMrS
- /PVsTEsPHwrbexlr3tpvwHGk2MGGRlrWDBIUnKsIMx/Fe4tTsBsTP/2TYj7MRS3m
- bms6w0+ouJDJgF7d07LebLrpMZrYAYIZFT6FSB/KQP8VWytCawI/ZsyXG15aeC9B
- 502unJUCdG8RziUAzoqglLsaGddoEjCctXo9X3WFQS+P7aiKlGjITmPtsuqm1LD1
- bUBkqhQVHvCFF7Siqurl8MbVFymDZy+YVta06jCtb7bwfDDzj8qlGlSUR/MaiIp1
- eFECAwEAAaNGMEQwIwYDVR0RBBwwGoIYb25saW5lLmxlYXJuaW5nLm94LmFjLnVr
- MB0GA1UdDgQWBBRk8+5NSCNEYCchqOa7djqpmDEBizANBgkqhkiG9w0BAQUFAAOC
- AQEAG4qfEzoBRdcsDiwwUV/0j2+a6jyvvubrSTT0CN7uimYD4WvToZPzbF4Iplhl
- HfhNea9qW3FZP7HL5WrPJ7BouC4fd1ANNLHkWP4d8SG791AsFmOYE6CuoQNtIgIk
- gP7FCwLm32qfdKDTstNJD5M8xxnsaPEpJ3CzWdfj9W3+N9zHFN6Mmzx1lmN13caY
- q1sEo+gMWL70f630KrLkv+mSCX7HOghX0MdfHiMfFF8pWMDcdK95shlMvgxopchA
- SaTzWzW01k5T4ghk2Vu3wFC5Uhvf784/L5scPVgjdNOphSkNU8CjG6/BKcNB+Sj9
- o5MI6HedqkvwS3+4RL381q0wMw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Learning Institute</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.learing.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 9889e11b..00000000
--- a/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.wadham.ox.ac.uk/shibboleth">
- <!--
- This is a "Wadham College Online Services" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:05:02Z">
- <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://online.wadham.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJALC8N31Bxem1MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFm9ubGluZS53YWRoYW0ub3guYWMudWswHhcNMTMwOTE4MTUxMDAzWhcNMjMw
- OTE2MTUxMDAzWjAhMR8wHQYDVQQDExZvbmxpbmUud2FkaGFtLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6P1eqo6vGLQ8belmeC1OABP
- Q+8rrHutPoi2tZqxTpTrJ487RzfXewuseL9ZnqiqrM1oGbtaLCeSMAscUhA+0pVG
- 3JQqyPVx4OTMD1fCpmHCoJhP84Hm0E1OGRIQrwsh9jkUaPfnyTT5CPVfhLvYeeof
- /2QJyBTFto97tu/e3g1lryfl+G6DGz45QsxlT8Y8XWKTTEah5yV9kMf9NvsQcBQO
- y1UoeC54+WxVbJOLmgwpJ21bf2BtR9HZJsOe3J37t7JUh4qf8UA5fBrUJ6mCFGL3
- bWe3wpjlGcHXFDvbkLULbYAeKQvRXyAPL3fBjhi7dYRxAhZQ1/U2euya1tjvQwID
- AQABo0QwQjAhBgNVHREEGjAYghZvbmxpbmUud2FkaGFtLm94LmFjLnVrMB0GA1Ud
- DgQWBBR8Qf8m1RqCT3m33pxvjlTkhZATXTANBgkqhkiG9w0BAQUFAAOCAQEAi2NK
- DPuahKflk5F15c2KvgsjN2HZlqyjArXAOkC/WEHxmALfcC7fKhxZ+ZswN/GaloMq
- wkK9MMl61drhKc0Orc6tFmhGir/XYKkOVBKu/Pf2yCa6s3OG/qyE6qW4QIeX/0ST
- Nh+S9H9eUwANjSvlEi90DqdAjBtptDiixL8vQv6xJOiDGHbhLEy9pNIqA+PuhxYq
- ZBzrg7vmdb8KkovS484OUW581FTUg6swa1qCaUDGpx0qTlPS7az48E48M2MH2noU
- rS7gR1zE0y5C6TsN4qrs1MIERdUghBanwGLvUx0cbHGEEeORDix59lF5UFrB/jID
- tUQQdKZmNRJfFzNHXQ==
- </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://online.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Wadham College Online Services</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Lee</GivenName>
- <SurName>Wootton</SurName>
- <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Lee</GivenName>
- <SurName>Wootton</SurName>
- <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml b/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml
deleted file mode 100644
index ad4e9c8b..00000000
--- a/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://onurbantribe.com/shibboleth">
- <!--
- This is an Urban Tribe Shibboleth SP for Take Note Student Advertising Ltd.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T12:53: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>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Urban Tribe</mdui:DisplayName>
- <mdui:Description xml:lang="en">Urban Tribe officially verifies your student identity online enabling you to unlock online discounts, deals in your city and tickets for clubs.</mdui:Description>
- <mdui:Logo height="100" width="350">https://onurbantribe.com/static/images/shibboleth-sp/logo.jpg</mdui:Logo>
- <mdui:Logo height="100" width="350">https://onurbantribe.com/static/images/shibboleth-sp/logo-transparent.png</mdui:Logo>
- </mdui:UIInfo>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onurbantribe.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://onurbantribe.com/Shibboleth.sso/Login" index="1"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onurbantribe.com/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAJMTWAj8iFJsMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHN2NTYwHhcNMTIwNjExMjA0NTQyWhcNMjIwNjA5MjA0NTQyWjAPMQ0wCwYD
- VQQDEwRzdjU2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0GLBi1CD
- FHq3HmJgAWG0/YEmU+KwVuSo2CbyoBy8L5hxzkOkuvnBQCh48sIPDJ4iFstOF9Cm
- nXlv7/V3O0Z5LCnAQpZfiMPL1A09QUFqe+LNAHjGluXmPMztYgPrt5rF95j1lkGU
- KYOmIoy1F7HK2RdBnOS2/6KAmUs1954ACi8h0YEFBrMq2XG40UrMp6FMwfonb/57
- 9Bugk4pzeht7QxxOuZc/+nK1H1a+b25PJ2yVxwJ/ddVRPSmEbyLTr5v2yhJgtinr
- veI3nor4gZaKZFaV/YpanhCrOFjWk15iD661Ovy1psOYo52RAi+x+SWsgxWix2Ft
- S0l8SVNx9n/bLQIDAQABozIwMDAPBgNVHREECDAGggRzdjU2MB0GA1UdDgQWBBS7
- Fz3DaNXlImw2RhvMkRZNeQW8IzANBgkqhkiG9w0BAQUFAAOCAQEAXoOTtO7bh2QH
- CkAHtfRrF18lFcyUFQS4EEq+HHIBVYG0+W4NQ6TNeLqSGyBBRZTDfspRKQxEiEgk
- 8OoxTCPsMsYgBaHwLCoGmIpTYlH/I3DRm4kmhcEdCW8coLxCrhPuNd0IywZzO/o/
- Z84Ls08JJEL0EufednzIztSLzMOsfUIDGKBXb9G6tsGcJkWYOx8LDI4T8c6NfNuK
- WHwGUCdFlPpjpHE9D30V2nD9AuJIVynYXOpenY9dBST3j2Tn/vg+xvKKioQsZJg+
- 8akeor6orfFsXUIHWOFjGoCjDH9laFChiptGPA8oP0hffeCl6PI2PJGFyKWI/47f
- nBvhT8cuYQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onurbantribe.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onurbantribe.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onurbantribe.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Take Note Student Advertising Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Urban Tribe</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://onurbantribe.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Nicolas</GivenName>
- <SurName>Carey</SurName>
- <EmailAddress>mailto:nicolas@takenoteadvertising.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ian</GivenName>
- <SurName>Guerit</SurName>
- <EmailAddress>mailto:ian@helastel.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml b/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml
deleted file mode 100644
index ceea7325..00000000
--- a/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://opac.hull-college.ac.uk/secure">
- <!--
- This is a 'Group Libraries Catalogue' Shibboleth 2 SP for Hull College.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://opac.hull-college.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJANOjhZD2KOnOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHdlYmJ5Lmh1bGwtY29sbGVnZS5hYy51azAeFw0xMDEyMjEwOTM2MTNaFw0y
- MDEyMTgwOTM2MTNaMCMxITAfBgNVBAMTGHdlYmJ5Lmh1bGwtY29sbGVnZS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8IuxsLcsMEuxEORkW9
- AnFMjw02hjqgUFDxdvxidErQcU28+mhiLL5E8IE9Rl74eLMQVz4wT1HFrCXuYQcw
- Re3p38ZVz1jryJPdIrycInbSlofAnvCtou/C6Xoax+FN4N1WzMBQEQCH2JAx0phj
- z8bg7ZiujJsI19ubQMogbyPgpxmyUPbU2w1RM7N12XUK8x54M7oMNIczSeKcA5AL
- bw2hAcDiDjmhjwHDQmT6pUeB4pGbjj1XcQ1+OnQtTJaDqBGXJuiTvFr3jyNa2oPv
- MiZBfOU8AQP7SMCBc/TL3rR9dMVViKIXTV1ypd0Vf2IM7dsckDchrEfuQ/R8vK97
- ZyECAwEAAaNGMEQwIwYDVR0RBBwwGoIYd2ViYnkuaHVsbC1jb2xsZWdlLmFjLnVr
- MB0GA1UdDgQWBBRJ3Rc19IVRl3z9Sk6sf/ZVgjBJ+jANBgkqhkiG9w0BAQUFAAOC
- AQEAABVnWpRznLdi/6Qs0tZigAbHQTmkB+PQQMcn3wHFiRCN8XmjCQlDDwPwjOO0
- RgXmDs1dsnOerNdxCoDAwKgcpKvwsTNt+BrseDpLgMVyKLlTOyABP/y+Py+dROtX
- NT38ftWChZlPQlYrXk/sxsSmwSBTkShxD67Cw28xbHjoQs+zyVM/ulX4z76tsvzu
- 9TZI38v39ORLQaev1uXFtEsesP5Jac6jbfZ/K3mfmeV5Jrirz3qiTONz7x4h/GId
- uC6cDuM71qVAazldO/xl5o70zE8taPprobQAtnQsNipmDtYx9dcrK69k2Mj8fONH
- hreSCClyOnSq2fhxrYHcWSAqPw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Hull College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Hull College: Group Libraries Catalogue</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://library.hull-college.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>David</GivenName>
- <SurName>Perry</SurName>
- <EmailAddress>mailto:dperry@hull-college.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>David</GivenName>
- <SurName>Perry</SurName>
- <EmailAddress>mailto:dperry@hull-college.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
index 77eea042..2284ec29 100644
--- a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
@@ -72,6 +72,14 @@
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.warc.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.warc.com/oa/auth/rcv/saml2/post" index="2"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">Warc.com</ServiceName>
+ <ServiceDescription xml:lang="en">
+ The largest single source of intelligence for marketing, advertising, media and research communities
+ </ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">WARC Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c24c7628..00000000
--- a/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossdev.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth Oracle Student Systems Development Environment SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-26T09:16:33Z"/>
- </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://ossdev.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ossdev.bsp.ox.ac.uk/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://ossdev.bsp.ox.ac.uk/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://ossdev.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEljCCA36gAwIBAgIJAL60sh6RnutVMA0GCSqGSIb3DQEBBQUAMIHLMQswCQYD
- VQQGEwJHQjEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsMHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEcMBoGA1UEAwwTb3NzZGV2LmJzcC5veC5h
- Yy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3QuYWRtaW4ub3gu
- YWMudWswHhcNMTIwNDIwMDgwNzEyWhcNMjIwNDE4MDgwNzEyWjCByzELMAkGA1UE
- BhMCR0IxFDASBgNVBAgMC094Zm9yZHNoaXJlMQ8wDQYDVQQHDAZPeGZvcmQxHTAb
- BgNVBAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQLDB5CdXNpbmVzcyBT
- ZXJ2aWNlcyBhbmQgUHJvamVjdHMxHDAaBgNVBAMME29zc2Rldi5ic3Aub3guYWMu
- dWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4rRdHCcVuu6oz7AM
- wQfDCXAm+0yoSqVpTShs2+uW2wr6VxCzgmLlwONGazhA3jZR/0ojRQJT35j35RSk
- pL6RE8Jy9zZXD/GQ7HR5H/LcIo3AXKv9FHhRVk5bIgcp6/rS/chlJQ3TKIE1RMHn
- lMrKCv6WyYyKIe6qJJt4DN/rtNWaIZVkzjAZD+8QJOBEMJi7iWnctQ3EF9nzcuS1
- RJBTc2aJhyShlHEEsBLV20id8pkxKNfbZeMSFaQw33UYdtJh2JPmLCfcciQZApIK
- i5B8IhBVpn2qpelM5Pq5jl9QhfASM0+5xD9oWfM36fLfJXIBRjz9M5CWYw8FxEi4
- AvVT3wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
- IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUtZDn+cXPWWmCgDu2phPc
- jplSjIQwHwYDVR0jBBgwFoAUtZDn+cXPWWmCgDu2phPcjplSjIQwDQYJKoZIhvcN
- AQEFBQADggEBALFrP69gFcbGc90D0HJlwzjnRo5hVAcxxXN89gCRsEZkqQ3O+yWO
- XWMW7XJB0ELH9pooNovUpumlgmW6iuzZI0BksQ/8mbIZGicrHDqnyGp0KQYHWmPl
- 8hesAETEYDNJ6cUT5FKxzMgydHP9fDB9w/GMLlxYtbslM2vj4M1eL6xVC2q1j944
- lQOR5Bc2Iy/6Btvksi+ow/omQFSObI38xadNJ728KJeHBhVOZ8YhZuV6D1byjuNz
- UmbxIdIWDNzlHZ0uKB8tDHzZ5YbPQEKEOWLwH1Bk6ws+sbt96iZaPFIQ62VZnYoY
- YxU030ZIxuip1Y4fwxQO9oIOpSCiB+C0W+U=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Oracle Student Systems Development Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stephan</GivenName>
- <SurName>Eckweiler</SurName>
- <EmailAddress>mailto:stephan.eckweiler@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml b/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml
deleted file mode 100644
index afdb74cd..00000000
--- a/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossqa.uas.ox.ac.uk/test/shibboleth">
- <!--
- This is an OSS Internal QA System Shibboleth 2.1 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFeTCCBGGgAwIBAgIJAJnksbFAueL/MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFj
- LnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5h
- Yy51azAeFw0xMjAzMDUxMzI0MDdaFw0yMjAzMDMxMzI0MDdaMIHKMQswCQYDVQQG
- EwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsG
- A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNl
- cnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFjLnVr
- MS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+g95ivEoWaKPygo1o
- GiDFprts8tNb/Lb9UmG/ykZaMY+yB+66NOg7aJDfsBCEzGCuuZuxeXNF6sUhUmVE
- cvIIdP/hXzUEiCPz5LcfU2GrVTlfDn+njnIS+n19wgu/R0GZTbMk+4u4S7UxMq4z
- JCYLajpfKTTSLAsTKRdy6LM68W+5MphvgLNWCkqgD+9L9zYtrcLrVqh+t1KVSZ+0
- kpCTESGzWGCMh1t9BoLt49Im//01nSAu8XyuOrL2w3oxxSO5/k7YJi6RPJ8nEQWj
- +nUaroumpaC1UBnbvF4UyB6X4ebjCNkdh+Tiubkys/DLMz7CmHCg2oTE/HqY2+UR
- WYcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
- U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTOuAowx121jbiBBs1/
- FqbE4pNPaDCB/wYDVR0jBIH3MIH0gBTOuAowx121jbiBBs1/FqbE4pNPaKGB0KSB
- zTCByjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQH
- EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQL
- Ex5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMxGzAZBgNVBAMTEm9zc3Fh
- LnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3Qu
- YWRtaW4ub3guYWMudWuCCQCZ5LGxQLni/zANBgkqhkiG9w0BAQUFAAOCAQEAEf7S
- +TzVC8Zq65a1hcRCmXGHkBTOchnPlqFrm4lqJkjItX6B+wE985dy/DV4z+LoypFs
- mOpJZI2A44jznpTZj0gV4r1xcjXnpS/JiQtRyQ64NDQwmIJTPU1+oyqYaMu0Nh27
- FRvT9F/sixwPpax4OcyOXqIecawLTTcUf6KemTRmc0zFmSLgCBfXzO0UST7s4nIW
- zLcEiFKmS/2I3iGPJa+BVROcRn0XdwOQsjD5sJpvnrOd5vnMFgv5Ib6P21hNJtXj
- X09UugykpbT5QYHsHArFhfBRDDSVYroBYZTQHn+pGpHugLzrZv+R6eNNN3UErThn
- 7a/D/ZX8zHELsULLOw==
- </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>
- MIIFeTCCBGGgAwIBAgIJAJnksbFAueL/MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFj
- LnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5h
- Yy51azAeFw0xMjAzMDUxMzI0MDdaFw0yMjAzMDMxMzI0MDdaMIHKMQswCQYDVQQG
- EwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsG
- A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNl
- cnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFjLnVr
- MS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+g95ivEoWaKPygo1o
- GiDFprts8tNb/Lb9UmG/ykZaMY+yB+66NOg7aJDfsBCEzGCuuZuxeXNF6sUhUmVE
- cvIIdP/hXzUEiCPz5LcfU2GrVTlfDn+njnIS+n19wgu/R0GZTbMk+4u4S7UxMq4z
- JCYLajpfKTTSLAsTKRdy6LM68W+5MphvgLNWCkqgD+9L9zYtrcLrVqh+t1KVSZ+0
- kpCTESGzWGCMh1t9BoLt49Im//01nSAu8XyuOrL2w3oxxSO5/k7YJi6RPJ8nEQWj
- +nUaroumpaC1UBnbvF4UyB6X4ebjCNkdh+Tiubkys/DLMz7CmHCg2oTE/HqY2+UR
- WYcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
- U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTOuAowx121jbiBBs1/
- FqbE4pNPaDCB/wYDVR0jBIH3MIH0gBTOuAowx121jbiBBs1/FqbE4pNPaKGB0KSB
- zTCByjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQH
- EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQL
- Ex5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMxGzAZBgNVBAMTEm9zc3Fh
- LnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3Qu
- YWRtaW4ub3guYWMudWuCCQCZ5LGxQLni/zANBgkqhkiG9w0BAQUFAAOCAQEAEf7S
- +TzVC8Zq65a1hcRCmXGHkBTOchnPlqFrm4lqJkjItX6B+wE985dy/DV4z+LoypFs
- mOpJZI2A44jznpTZj0gV4r1xcjXnpS/JiQtRyQ64NDQwmIJTPU1+oyqYaMu0Nh27
- FRvT9F/sixwPpax4OcyOXqIecawLTTcUf6KemTRmc0zFmSLgCBfXzO0UST7s4nIW
- zLcEiFKmS/2I3iGPJa+BVROcRn0XdwOQsjD5sJpvnrOd5vnMFgv5Ib6P21hNJtXj
- X09UugykpbT5QYHsHArFhfBRDDSVYroBYZTQHn+pGpHugLzrZv+R6eNNN3UErThn
- 7a/D/ZX8zHELsULLOw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Internal QA System</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ops</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml b/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml
deleted file mode 100644
index ab6c425a..00000000
--- a/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossqareg.bsp.ox.ac.uk/test/shibboleth">
- <!--
- This is a Shibboleth 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAMKLTuIl8HViMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azAeFw0xMzA2MDMxODMzMDFaFw0zMzA1
- MjkxODMzMDFaMCAxHjAcBgNVBAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZr7IJhB64g62Jt+7EgvSh0L8V4
- m/2FVHXVo/FJoCU5PVVVNtfuEAnO7f/FMuF34bTtHVzqu6mIqfJqEiO1tyRuiJsy
- VjXxm9MWyq/UQPiEoyV8QJ/qpWGpNUPGzcn1Gw0oFN0lYrSIyepJiEAYiaMYR+rY
- S2PMc+iU6KpqIhLvsyv7ccs738tzCxM+aSnAoQ+vVoig30PZ1HzGywOs0Pis682+
- eeWGBpmvutNjLk2cotxbizRADWFr/yx+rZ4HMXGLI1Sc1EFC9x6WtySmuiM5k3+n
- Vg4+4VBsUVISUjYgOVsRvYvdeJqzVoDm3nP4s4LEqoxYqulVNDUGKlieHekCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVb3NzcWFyZWcuYnNwLm94LmFjLnVrMB0GA1UdDgQW
- BBR7YBp6Sgd3qSoeZUtIn4qB1FFc1DANBgkqhkiG9w0BAQUFAAOCAQEAj+SAqGCM
- vuaZE0dqcay6x2xY0sbT+d8DWreTan79N+q8WanXqs+clmS/w6rVhdYxMffDNEQv
- v7zq3OQpOS3ReIRjz5Dm/qFZjyCZE4L3LkYNC+9RUbMvApvzYTD5CPYznlAdyXA8
- FG9ZWeeQI0pEHHHRykEmz12uK0/zO16v78VKuhP09My7mJ1mxWIr0fS9kgwP0X3m
- MkwFVKoU+Yy9f858uV0KW21E0q5IeebnXIUe7laEFgq3ZNDaukZBuIVNy2bRGJjz
- 5ZuRYtdAggGQrbnCncfBTvRdkt5NW1P+dd8GrqAak6nyIRovFxZ6uoRPnfDeJnx5
- RLm2YLdhtPjigw==
- </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>
- MIIDBjCCAe6gAwIBAgIJAMKLTuIl8HViMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azAeFw0xMzA2MDMxODMzMDFaFw0zMzA1
- MjkxODMzMDFaMCAxHjAcBgNVBAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZr7IJhB64g62Jt+7EgvSh0L8V4
- m/2FVHXVo/FJoCU5PVVVNtfuEAnO7f/FMuF34bTtHVzqu6mIqfJqEiO1tyRuiJsy
- VjXxm9MWyq/UQPiEoyV8QJ/qpWGpNUPGzcn1Gw0oFN0lYrSIyepJiEAYiaMYR+rY
- S2PMc+iU6KpqIhLvsyv7ccs738tzCxM+aSnAoQ+vVoig30PZ1HzGywOs0Pis682+
- eeWGBpmvutNjLk2cotxbizRADWFr/yx+rZ4HMXGLI1Sc1EFC9x6WtySmuiM5k3+n
- Vg4+4VBsUVISUjYgOVsRvYvdeJqzVoDm3nP4s4LEqoxYqulVNDUGKlieHekCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVb3NzcWFyZWcuYnNwLm94LmFjLnVrMB0GA1UdDgQW
- BBR7YBp6Sgd3qSoeZUtIn4qB1FFc1DANBgkqhkiG9w0BAQUFAAOCAQEAj+SAqGCM
- vuaZE0dqcay6x2xY0sbT+d8DWreTan79N+q8WanXqs+clmS/w6rVhdYxMffDNEQv
- v7zq3OQpOS3ReIRjz5Dm/qFZjyCZE4L3LkYNC+9RUbMvApvzYTD5CPYznlAdyXA8
- FG9ZWeeQI0pEHHHRykEmz12uK0/zO16v78VKuhP09My7mJ1mxWIr0fS9kgwP0X3m
- MkwFVKoU+Yy9f858uV0KW21E0q5IeebnXIUe7laEFgq3ZNDaukZBuIVNy2bRGJjz
- 5ZuRYtdAggGQrbnCncfBTvRdkt5NW1P+dd8GrqAak6nyIRovFxZ6uoRPnfDeJnx5
- RLm2YLdhtPjigw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Oracle Student Systems (OSS QA REG)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Help OSS single sign on</GivenName>
- <EmailAddress>mailto:help_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Technical OSS single sign on</GivenName>
- <EmailAddress>mailto:technical_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
new file mode 100644
index 00000000..74509a23
--- /dev/null
+++ b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.gwdg.de/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-07-23T08:14:22Z">
+ <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">GWDG ownCloud</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">GWDG ownCloud</mdui:DisplayName>
+ <mdui:Description xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</mdui:Description>
+ <mdui:Description xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</mdui:Description>
+ <mdui:Logo height="34" width="86">https://owncloud.gwdg.de/themes/gwdg/core/img/logo-icon.png</mdui:Logo>
+ <mdui:Logo height="121" width="250">https://owncloud.gwdg.de/themes/gwdg/core/img/logo.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.gwdg.de/index.php?id=owncloud</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.gwdg.de/index.php?id=owncloud</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>owncloud.gwdg.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=owncloud.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGBTCCBO2gAwIBAgIHGZYpoiZt7zANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTUwNjA5MDkw
+NDE4WhcNMTgwOTA1MDkwNDE4WjCBlTELMAkGA1UEBhMCREUxFjAUBgNVBAgMDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcMCkdPRVRUSU5HRU4xPjA8BgNVBAoMNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MRkwFwYDVQQDDBBvd25jbG91ZC5nd2RnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA2ntP3N8gXUfwCL/A70QAl7kMBYOvdLZBkom1SyqjQTrj+DPw
+HDRwWULQwGsOpYbXmTK2PQwhbv8NKWs12pt/lGq8M++FlbNtvAEV3TYeI6ZlmyeF
+u4G3QUq32SE4Ugp2lsabYR6EOESmFTdlRRdTyEoQf/+Qwc/NUbvBeP4K6akQb2Ob
+ZmC8F7APt0ygVObYy8CGM7ylPBOJqWf+kEMQnDfE6fr/HrnLdu/hIdaRcLXEP56b
+agiKxGEBKE2Fc1E7H0UI+/e72FUKgbc+ysYmDL8oT80x7AjlajYY+wVgcpRcW4cM
+0e3GbcknK16YYmY8q3CdVtj3/4Y8meu44WMXpwIDAQABo4ICMDCCAiwwTwYDVR0g
+BEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsG
+AQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTsl11h
+9jKQ+wdpd3WSjfDmtciJ1DAfBgNVHSMEGDAWgBSm5P+Y/eVJMn5cdfIWok2MdDXe
+IjAbBgNVHREEFDASghBvd25jbG91ZC5nd2RnLmRlMHkGA1UdHwRyMHAwNqA0oDKG
+MGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIHJBggrBgEFBQcBAQSBvDCBuTAzBggrBgEFBQcwAYYnaHR0cDov
+L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEAGCCsGAQUFBzAChjRo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2d3ZGctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA96xKnKFT2
+NSmczKpZGmNZW572lpvkwYWGfA0IV8AtJdORaOI+KS7PhzWhON5UyP2w0xZh3si7
+G2f1ScagLmX1Qei9mYQ3h8VGJ6hATKmwccCaz+CzN1bMrGqtThDOpjnri6nOr41/
+Iw+KpUgPO+Lb+dzFTMfZ2+SqZ2PEAfLvJx8guNAy7Brf5VgdSJ31a9JysnUqZEFl
+sX53TC6M6wRu6yWfA4TDxy1hQcAfLZ2wPZqE+ymMpFd/uLFvK0gdSYFWr9A2+Nnx
+Rb/ka7SePtjY0euaMALaPR9W7IjIuhMt94Z9HqdfqXIeT2YYW1AA5PEdMJKAi5Sc
+OaPal0OnuJy7
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">GWDG ownCloud</md:ServiceName>
+ <md:ServiceName xml:lang="en">GWDG ownCloud</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="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">e112</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Ralph</md:GivenName>
+ <md:SurName>Krimmel</md:SurName>
+ <md:EmailAddress>mailto:ralph.krimmel@gwdg.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Daniel</md:GivenName>
+ <md:SurName>Adler</md:SurName>
+ <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Daniel</md:GivenName>
+ <md:SurName>Adler</md:SurName>
+ <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml
deleted file mode 100644
index cfae5fe0..00000000
--- a/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford-stg.saasiteu.com/">
- <!--
- This is a "SaaSit Staging" FrontRange SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-01T12:23:26Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
- iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
- A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
- BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
- MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
- A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
- bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
- RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
- Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
- VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
- GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
- ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
- qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
- m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
- CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
- m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
- MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
- DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
- VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
- ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
- Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
- dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
- dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
- U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
- b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
- hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
- 82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
- LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
- QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
- Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
- sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
- </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>
- MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
- iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
- A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
- BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
- MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
- A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
- bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
- RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
- Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
- VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
- GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
- ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
- qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
- m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
- CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
- m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
- MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
- DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
- VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
- ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
- Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
- dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
- dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
- U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
- b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
- hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
- 82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
- LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
- QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
- Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
- sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <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://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
- <AttributeConsumingService index="1" isDefault="false">
- <ServiceName xml:lang="en">FRS</ServiceName>
- <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"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SaaSit Staging for the University of Oxford</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://oxford-stg.saasiteu.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Cloud Service Management</GivenName>
- <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>SaaS NOC</GivenName>
- <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml
deleted file mode 100644
index 1ad70852..00000000
--- a/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford-uat.saasiteu.com/">
- <!--
- This is a "SaaSit UAT" FrontRange SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T13:57:22Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
- iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
- A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
- BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
- MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
- A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
- bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
- RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
- Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
- VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
- GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
- ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
- qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
- m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
- CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
- m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
- MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
- DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
- VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
- ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
- Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
- dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
- dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
- U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
- b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
- hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
- 82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
- LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
- QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
- Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
- sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
- </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>
- MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
- iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
- A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
- BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
- MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
- A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
- bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
- RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
- Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
- VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
- GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
- ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
- qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
- m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
- CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
- m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
- MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
- DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
- VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
- ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
- Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
- dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
- dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
- U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
- b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
- hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
- 82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
- LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
- QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
- Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
- sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <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://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
- <AttributeConsumingService index="1" isDefault="false">
- <ServiceName xml:lang="en">FRS</ServiceName>
- <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"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SaaSit UAT for the University of Oxford</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://oxford-uat.saasiteu.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Cloud Service Management</GivenName>
- <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>SaaS NOC</GivenName>
- <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
deleted file mode 100644
index 078a5ae8..00000000
--- a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford.saasiteu.com/">
- <!--
- This is a "SaaSit Production" FrontRange SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T14:04:54Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
- iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
- A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
- BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
- MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
- A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
- bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
- RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
- Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
- VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
- GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
- ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
- qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
- m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
- CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
- m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
- MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
- DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
- VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
- ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
- Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
- dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
- dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
- U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
- b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
- hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
- 82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
- LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
- QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
- Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
- sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
- </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>
- MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
- iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
- A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
- BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
- MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
- A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
- bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
- RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
- Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
- VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
- GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
- ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
- qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
- m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
- CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
- m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
- MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
- DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
- VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
- ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
- Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
- dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
- dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
- U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
- b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
- hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
- 82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
- LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
- QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
- Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
- sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
- <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://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
- <AttributeConsumingService index="1" isDefault="false">
- <ServiceName xml:lang="en">FRS</ServiceName>
- <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"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SaaSit Production for the University of Oxford</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://oxford.saasiteu.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Cloud Service Management</GivenName>
- <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>SaaS NOC</GivenName>
- <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5967cf40..00000000
--- a/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxris.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T09:03:32Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://oxris.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFDCCAfygAwIBAgIJANz9IQy8b9XUMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
- BAMTDm94cmlzLm94LmFjLnVrMB4XDTEzMDUyMzEzMDczMVoXDTM4MDUxNzEzMDcz
- MVowGTEXMBUGA1UEAxMOb3hyaXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQDN6rRAxFlBqDGTExqMRUSaXGm1yq5hSiwSye0kEMaw78Mw
- Q9bzvdiiFIqQYOzAmPTXjjTcFl49W/WsWGI0E3oupKEj6yvVve9GlHdS9ecsULw6
- TSlglQfGdoa5OcIXPsPtB2CLlAYnodJ7efunK5eRxlEajioIr9Hw3HioMaCmrFBt
- hskCpa0I7YDwhP2MhuEInmPajPKBy6JKhfFfmm3sVKmy42jFJ4ZzqgM/A+pQW8ep
- iDMZlN6Bf4Uc8d8BqxaYjjHmM0r75yo16keF2rTbw13VzQqZWjFgxUCAvlQcu9IT
- esF4JRBAM1yKw+jZu0rrE9ZhL6S4mLWJeR5mpST3AgMBAAGjXzBdMDwGA1UdEQQ1
- MDOCDm94cmlzLm94LmFjLnVrhiFodHRwczovL294cmlzLm94LmFjLnVrL3NoaWJi
- b2xldGgwHQYDVR0OBBYEFFVJkWxVEz06s2GjVAjMidooLybqMA0GCSqGSIb3DQEB
- BQUAA4IBAQBtukSj8KhiZC8MvgG4nF05YlhbD/7lm9QDxmHakjwUA6WraBzZgvtf
- sqlsQCvsOyRM+I4VB987Ib0vUzIgJ9dthq4gxLYJ0TudIDHotAVsiprgmpe1hCs7
- cmD5/YwOukvE5rkxkTgHn9l7zd3ZHHmDMmIt/uN8CeKrmGSLuIxI0/N6GHHiZXXe
- yowH/IAzH/mmfgXZoIopCvOTvbQAnaYP8THvMHnL2msQellt5QKsGxWVBT/mBXy7
- F6nq62YvHGeR/gQ1pJn5GCiX9fCm9dtCRAW4mZGFoQVTTBi0u5wVGpbSVpf/ECNE
- a211q7638e8Me8aRfDaUkXlVr7Xnqd5+
- </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://oxris.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Symplectic</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Malin</SurName>
- <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 72a55b41..00000000
--- a/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://papercut.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a "Balliol Print Service" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T13:49:37Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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://papercut.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAPTQm4DlPP/UMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXBhcGVyY3V0LmJhbGxpb2wub3guYWMudWswHhcNMTQwODI5MTMxNDQyWhcN
- MjQwODI2MTMxNDQyWjAkMSIwIAYDVQQDExlwYXBlcmN1dC5iYWxsaW9sLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutBlc2yLd/3y+6h6
- VzJ6YyuYupu08Ij3ktLRVCoTOybjBGPYu38BgUrs+Y+Vf5nXtpDWDpATpWSpfSMf
- YSIjOC2nhbfT5QdHQu83HhxP4ZD3kMEqBnL7X6E3ywR/+IdmdizTjbm6lIHUK9cp
- Rt2OwtJ5i0ScP7twuzvTlljkcMIw5HQzKOkRhwQHoKSnx0jrCwNo4AW/PlWspZ8j
- B6bg9xuToATk2l/TpPojyv2MOaa3KHCk6IGsI/wVOKZQ5lMbD5EHNKQ+cGkdMbX7
- r4XNkWpQ4nsYCLjo/JYeR67Zlc0prCf3TaGFikHKIBedGcVmU5GaCpqAzVGt4aFE
- e2ckkwIDAQABo0cwRTAkBgNVHREEHTAbghlwYXBlcmN1dC5iYWxsaW9sLm94LmFj
- LnVrMB0GA1UdDgQWBBSBxNdryBa0/LvTZJnl7cLecW0RiTANBgkqhkiG9w0BAQUF
- AAOCAQEAj+CNndELm4jDspknGEKTYGu0xmMsLz8nO/tQ6hHYFsa7sE3pqYE9KNmy
- Cumz2wyZEJx3j5nLhIhtLnTD1d+EW8L0bVkyjNrv9HCMo8yZ2Sk+8ABDYQGIqCBY
- yILBp/EuvtnyDORlet6Xg3Jz350i2eKVGA3ju/fU3a4902Z9BidRw494682y26T6
- ZIKinjyVBG8zpJ9Kt1X5IyIp8hTOsGtpe3TqqRmyT82pquTgC7AZG3cZ4OE6ga28
- bLgZB5ayiZnXyheZDs/80xBMdoPVDvXvu3r7rN+MJrp51f5vVXi2ikp/nXY0Hh1L
- lBJNwFF+dySVUM4QYmAzTnXIHhR7DA==
- </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://papercut.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Print Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Balliol Computing</GivenName>
- <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Balliol Computing</GivenName>
- <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index b0833ad8..00000000
--- a/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://papercut.some.ox.ac.uk/shibboleth">
- <!--
- This is a "Somerville College PaperCut" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-14T15:00:49Z">
- <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://papercut.some.ox.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAJTgsqCNR2RFMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnBhcGVyY3V0LnNvbWUub3guYWMudWswHhcNMTQwMjI1MTQwODM0WhcNMjQw
- MjIzMTQwODM0WjAhMR8wHQYDVQQDExZwYXBlcmN1dC5zb21lLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2DvJXeXlacXKCCY8E78LHJh8
- eRHB6YWFigkDoY4gljzONk1eXVs91A4fk1soSLaitd7eweWpsSIu2il8iPEpKS1X
- 0Fp6dU2EOkeo+/pDlq71lFg0zGncxuKBAklZMmMMthj0o6u0M5ZH6Uv2Ep9H4dna
- 8iXyoAjvF2HihhNc9qaJ29BayvL4ucgRhce8+vNfl4eFcgSYU+rQSAZedPcMf4Rh
- xiWV1ipV/pqrzLTCP9Mwy1yeneOP9saE/2hRa2JGaq1lF5F2LzL5++Ek+/gpoESy
- 1yIeMvOuE0beSFRb32mYvNNMQ/Do1lloe09RJasy4MO4ze/Ub7B05rBknkeouwID
- AQABo0QwQjAhBgNVHREEGjAYghZwYXBlcmN1dC5zb21lLm94LmFjLnVrMB0GA1Ud
- DgQWBBQmEF+Bgv8GPVkPUmxy+ZDVjdTonTANBgkqhkiG9w0BAQUFAAOCAQEAbfj2
- C9Oz1jGuH3oqNtIQOzq7VV38/xUZHQOWEFlbn2GdDLd0Bp9KYrfZMJ2Gpr9XgFm+
- GNHTkfJakoOyDrmwui3XMBkZqs/RtVsBnxPYfFkrawh1oZpls5+uyAHgoGGApOMn
- bK69F+9mOEWH2QPaQn7hLTqNTHcubfP0V52ChJrnYdlKgADnCEaCyJRfZjmljdzT
- gbEWpkOKwE5d0gwdq4us5exBrdkUlMM7KHLuugDsVNTLNbaHlfnE4c4EjQfT3Bpv
- jrFl6qt83WYiXy7/PXLwzdBVFaAdHuYVityl5CQOME5+dJK+op9PdCByouFxrRFQ
- gKBXjAALAzv1gQI1Jw==
- </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://papercut.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College PaperCut</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
index 0f453689..8ee09623 100644
--- a/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
@@ -12,8 +12,8 @@
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">University of Leeds</mdui:DisplayName>
- <mdui:Logo height="16" width="16">https://www.leeds.ac.uk/leeds/logo/UOLL16px.gif</mdui:Logo>
- <mdui:Logo height="60" width="60">https://www.leeds.ac.uk/leeds/logo/UOLL60px.gif</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://strategy.leeds.ac.uk/logo/uol16px.gif</mdui:Logo>
+ <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:IPHint>129.11.0.0/16</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
deleted file mode 100644
index a6c1d893..00000000
--- a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passport2.e2bn.org/shibboleth">
- <!--
- This is an E2BN Online Services Shibboleth SP for the East of England Broadband Network.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-06T09:59:42Z"/>
- </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://passport2.e2bn.org/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://passport2.e2bn.org/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEqjCCA5KgAwIBAgIQaxilpKtFyudwNIabYTWe6zANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDgwMzAwMDAwMFoXDTE1MDgwMzIzNTk1OVowgYIxCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIEw1IZXJ0Zm9yZHNoaXJlMRIwEAYDVQQHEwlIaW54d29y
- dGgxKjAoBgNVBAoTIUVhc3Qgb2YgRW5nbGFuZCBCcm9hZGJhbmQgTmV0d29yazEb
- MBkGA1UEAxMScGFzc3BvcnQyLmUyYm4ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAwWzHYa3GF8L0WS6Vy+/oj4BXuLIegDpYmZpOdNHKc6cUelYD
- mANHjc8crK/OzfIkdYZ/xd+RM6GWHiDfo0DwI7/T8WtOLEGy/liM+ekPEq4XQdZk
- tDWCF937oj5CbXH8QPWdzyFVf4AUA6Sb+JZpO0zT5ptW8WHeM6TFP1izlXhaNvOl
- Ql3lBSCuVJcMCiHUUabgA96JByWviim2i0UkHDK5NVrsx1KYL7oK2ipOuds5HXa6
- yy/s1FUQ4DkK3xEn3ES6JQTFEwPQ1RgR3xryY335ilcvtd7Xd+ELBKuHxxB2FJGy
- 6hNcwxreLeFQiKiIV6BMJLvOh4JPBJ82GKaXQQIDAQABo4IBZTCCAWEwHwYDVR0j
- BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFE6U3xk/mGGDfrom
- 4PmC+wZxRgXgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
- MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
- MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
- RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
- L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
- Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEnBhc3Nwb3J0
- Mi5lMmJuLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEAGF313BU94mPtvNABYwuN2RmM
- 6bUyIkedHzkE2t3jhLB5TBl1dbqcAqA9Ojgxa0/81bbtOgccAYm90df/PqFI2V5z
- pyeMJodK8M/W+mlGfl6KtBPyV3ioFflhIeyubLUhDxP2pacTI40+4GYsylHMcvEx
- NwzL7DXqWFzPK2OqdEqrQWFko+VnnfRDcg7pMaKO9+xqhutw9XGmllUTk1rLr/Bn
- QVZejbc10E/YaTEWXrvsnOUPvKi9ufV7mkfi5Zq0LtwlpeI4IjgaykGZHEEcTdNA
- A48T78ntBTNuYYtFdpAkqpAcvMhkrMJplW2G4+KFLeotqtZzBTkyIj5MANRJuA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">East of England Broadband Network</OrganizationName>
- <OrganizationDisplayName xml:lang="en">E2BN Online Services</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.e2bn.org/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Bright</SurName>
- <EmailAddress>mailto:service@e2bn.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>Bright</SurName>
- <EmailAddress>mailto:service@e2bn.org</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d3bee98f..00000000
--- a/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://payments.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth Balliol Payments SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:54:03Z"/>
- </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://payments.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAPvOedFZEvkcMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXBheW1lbnRzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTM3WhcN
- MjIwNDE1MjA1NTM3WjAkMSIwIAYDVQQDExlwYXltZW50cy5iYWxsaW9sLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFpid6d55DBZOLIs
- xpDcZGgKfqu6Gm/T/ZVJY3AOj5BjTdjCiLn57FpMEkyCci7wODhEnTl7M1DFhVpo
- CskYhETMeERTP9C2vNco/X3UdCtkPR2ZWs/yBGraqBkyeg4kx7U6+trEwO+Sqirj
- 2AHrPOwBJgtyIUGVsXgF9o54bptyQQsHIUX7+XPW7stiZ5X035HR5tB6hjfoZoRe
- skzs6kploPCCxN8dL83lYw8VdYHWyvQmgXL4fsqTGaULcUGEjhekubGxIFL5xQRF
- l3oWY4sIz5x9FMkbwt2S8NQzQokbvKpQcntotUMHYik1fLU/0QVoTEj0PR7en4GO
- guTiNQIDAQABo0cwRTAkBgNVHREEHTAbghlwYXltZW50cy5iYWxsaW9sLm94LmFj
- LnVrMB0GA1UdDgQWBBTP8wkRhzQFe7iXTxZIrPIt8T4xtTANBgkqhkiG9w0BAQUF
- AAOCAQEADgadkCnPCWgs1Y0S3Uz5ErkdPvxNlTx0Qau1DxXx2QOwqVvc55xyNcKt
- s6MJ4dwlZPYWPZT2b1G49pmUUMUp87XD1M6melhm2IzcTbyRJrA+KoSAFEL/hEBp
- z8MrOtNI5/IPFfZOpwvoJMdUb2wxAscU+CoEa9HF+YndCPZmscMYOE3D3/3g+hAE
- CC7AGt/AG6LsibsXDiL7RB3S0844C/T32nam6C59kwWg0CWWQuZIY+9xZDctOgIb
- IDoUKfE1W4rdUtZ3bT+Ra7wnX0tmfUBlBc/h/38W9wQV1kqa3tnH8BEuC0Jpqcq4
- U0MKDSCQFv1ZBA4ckzGCSivlU9HSig==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Payments</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stewart</GivenName>
- <SurName>Tolhurst</SurName>
- <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml
deleted file mode 100644
index aab892b9..00000000
--- a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://platformdev-secure.palgraveconnect.com/shibboleth">
- <!--
- This is a Palgrave Connect OpenAthens SP for Macmillan Publishers Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-14T15:05:33Z"/>
- </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>
- MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
- SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
- A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj
- dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG
- EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV
- BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u
- bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2
- JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk
- XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI
- ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo
- XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT
- XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB
- ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg
- X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA
- UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr
- +HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm
- 1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt
- oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy
- ZuQ=
- </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>
- MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
- SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
- A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj
- dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG
- EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV
- BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u
- bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2
- JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk
- XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI
- ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo
- XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT
- XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB
- ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg
- X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA
- UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr
- +HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm
- 1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt
- oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy
- ZuQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect Dev</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mohammad</GivenName>
- <SurName>Nawab</SurName>
- <EmailAddress>mailto:m.nawab@nature.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>Ollier</SurName>
- <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
index bee26c5a..45097b1c 100644
--- a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
@@ -35,8 +35,8 @@
</ds:KeyInfo>
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://press.endocrine.org/action/samlACS" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://press.endocrine.org/action/samlACS" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/samlACS" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/saml2post" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://press.endocrine.org/action/saml2artifact" index="3"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
diff --git a/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 064a7b56..00000000
--- a/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://print.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College Printing" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:13:00Z">
- <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://print.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJALkFh47QbpfXMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnByaW50Lm5ldy5veC5hYy51azAeFw0xMzA5MTkxMDI5MzNaFw0yMzA5MTcx
- MDI5MzNaMB0xGzAZBgNVBAMTEnByaW50Lm5ldy5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBANPIKlurQiFli0Hnv0m5ABmNWlKx/lyPaFvx
- x0Q/WZekfTwsY+rOlrEAxzqrsIxFovJVjC08ZXlJAbVhEBQF7wyMdUKGqWx7sZw2
- FdejixKcMWoVbNLHKVXyqyvLkvrFwPnHtugz4vYyAAPb9OCLuvxXyMPKaY7lOjJ3
- eSbeTN5PGY+6mLKnUlqeYVz2t1JIKgBJDU/N4AslwEwpb+LcmwYtktphGnV2bq7+
- 1yevEbRdBoALjE9wMmSP2hptG8ULhIA4xHy/EzzBBz3GQbAG/cGlthXQ34yTOFk6
- cth/nq/3dTHHA+7hGnDn9PlMGa33BrldC1+0SjGJnOhIsUhEm2UCAwEAAaNAMD4w
- HQYDVR0RBBYwFIIScHJpbnQubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBRl12Aof4tQ
- GJLhta22gjeyyN3jaTANBgkqhkiG9w0BAQUFAAOCAQEAql1ag5DE6IPslp7ECr0m
- 7RVAUphXsGCKZeQBT4506oixZJkCINmwaElEArQqqoti5xURzP9KSqVOQE4mPH6i
- Z94XKj6JENbFTqagUu+65ZA36NkBpYaMNOts1Fzo/Sy28EDSlPnixmkfxmAgzfNk
- mhR1Me4KBDpOWuIsvWcNrZhbyAoRSSO3/C8iARyPx1lOlmEKUV8M81KRSeKqL4xR
- p08yeSnz0XrdHuuJNFUqliMTnBlTkrm0svViEkM5VcKnalM6kSWqlTY0MZMP3TtP
- fKkA3j1NfGZ2BkxqPMYQINetFuqX8bhCEVYwwQxYfCw9LXHLmYYRbR0Gmrgy3w8e
- dg==
- </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://print.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford New College Printing</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Dore</SurName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Dore</SurName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
index eb2f6b77..8c80f267 100644
--- a/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss.ox.ac.uk/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qa.esds.ac.uk/shibboleth-sp">
<!--
- This is an "ADSS site" Shibboleth SP for the University of Oxford.
+ This is a "ESDS QA" Shibboleth SP for the University of Essex.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,34 +20,40 @@
<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="2013-09-12T11:54:03Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-23T11:54:20Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qa.esds.ac.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa.esds.ac.uk/Shibboleth.sso/Login" index="1"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIC7jCCAdagAwIBAgIJAP/qxlEv7bfGMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWFkc3Mub3guYWMudWswHhcNMTMwOTExMDgxMzQ5WhcNMjMwOTA5MDgxMzQ5
- WjAYMRYwFAYDVQQDEw1hZHNzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEArHVqMd2kMeKJpStSFHb7uEys8jMcMP6914I2kWcuDAyKeQVY
- Wvg+ZJAabdhA7dmKjK+uIxpT5h+urWs2uQHHO0t4/4t5PET+T2qDMEU8sBbvWOn7
- KRbjrT8/YEyQFp8yQGCMWcaUQLQRE3zaAvc9TUPJPzRIZz3kqyVZBv6TGOxgzsPb
- WbOshySY++spJMYdfNa2++YruxX9mQjqqzZoecIRUswrGQNidF04QH9BhbLdaFh/
- ObmQiUYvxbK91ZgQcd7SUfJ0KIRQiCv8dTEzb4mlpCcait5LDXNb21rme6UbS2Zx
- XyE7QLzwYS+qNZE924zyQqWBf6kmTwaYKQiUOQIDAQABozswOTAYBgNVHREEETAP
- gg1hZHNzLm94LmFjLnVrMB0GA1UdDgQWBBQB1FqDeiZFHC/T8F9PLbIfLCr13jAN
- BgkqhkiG9w0BAQUFAAOCAQEAhmFOyd0wZBR+OJdsLQEe5CGK3Ym7FxIzZaUazWB+
- 4cjGFOJjKa1idVVCvIPXtO45eJrNQpRGAqznmS6uyRCTpndaJC/xB/HGcaXKScvx
- Gc7wOk5UUMgCTmJ5LVVxtvV8MJzUMkYaenisg3OuEi1lma11jSXSDVC6a18ssHro
- NgpvwcquNJKjqxwW7Y5aoAcmj2RxWpBmrNw8DRZugXSZ1j0XTPa3D5JjtiJuoZxC
- nZfz8UQMp19+eDLajMn0nNIlBSJSiAuqegfPigwnbbG23PFVcrIrfEbgzmjhPQBX
- 0L5ahXHEBkMNbqkYJ4vYi9x12H0Q83bsljQhG1lAVGQt7Q==
+ MIIDxDCCAqygAwIBAgIJAIFv979CtniPMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
+ BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+ aWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2RhcGxhdDIuZXNzZXguYWMudWswHhcN
+ MTMwOTA2MDgzOTI5WhcNMjMwOTA0MDgzOTI5WjBjMQswCQYDVQQGEwJBVTETMBEG
+ A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg
+ THRkMRwwGgYDVQQDDBNkYXBsYXQyLmVzc2V4LmFjLnVrMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA3ler7LUUd+O4SzG18ZOt3hnXvqPnF35l+uCoAP4U
+ /8UIglUqK7VPmQNjSIQUqqW04LtLpqJ6wCF4zzZx4yOzn5B7q3Ytu7awlYDDOoeT
+ S+E/9AaHbHIzgwSu64yHqIaGsiOfntVLVJVTVby5gnjtZk7BsLvEBbmRj/xQit2i
+ a4qoBbEfu2CV3JoikgEQ29ysaWL26BPGkPiMH4AJ8rbmkcuhsrrV4utjF6Y4XB7s
+ c5dSiCOmsiVk8qWvmvyRndUv+FqfFWKNTvhwjKUH6YPLT8fR3kya05PqP6MsfpME
+ rAK2prPIoCAq3O/5H3G8Uyv4qNXOKTlvWMeGSSrKXHne6wIDAQABo3sweTAJBgNV
+ HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+ Y2F0ZTAdBgNVHQ4EFgQUpCtjhsAZDcsg55nyc8m6G+rqmVkwHwYDVR0jBBgwFoAU
+ pCtjhsAZDcsg55nyc8m6G+rqmVkwDQYJKoZIhvcNAQEFBQADggEBAD27KL4LkToX
+ HnK4Ajmkn31e7OeB1IkDXbVU8yQmRBxQ/OVcHbf2r3dKUyVJh8kcC45eLX6CIa2S
+ YClmSnaixPYjpiu20jFV1SpglaQg3KM59qc7BvN/2a7jg7wDG6LU2d42uXPHFrtj
+ hi+kURBEMRtEPVDMjDslROkNZPEmQw8kI9cA/WWz5yW4NLqsRL2cc2rQZAUA/NUm
+ gG/+uv5UwFNZiXZVphq1ITLqgYzj4mxy9pPDT5DRu41/7tpeFgqQ1XA8gSzWh0zW
+ LD49UT6gUswxL81WggC8WDMvi5sq6xnHtq1JPxCeTWDeeafn0vCR4WAV2B2y6Iwj
+ ipl34THDqR4=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,30 +67,30 @@
<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://adss.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ADSS site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
+ <OrganizationName xml:lang="en">University of Essex</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">ESDS QA</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
+ <GivenName>Helpdesk</GivenName>
+ <EmailAddress>mailto:helpdesk@ukdataservice.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
+ <GivenName>John</GivenName>
+ <SurName>Payne</SurName>
+ <EmailAddress>mailto:jmpayne@essex.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
index f8085f58..661b5d0c 100644
--- a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
@@ -30,16 +30,14 @@
<ds:KeyName>randevu.lab.vvc.niif.hu</ds:KeyName>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Artifact"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/ECP" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML/POST" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML/Artifact" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/ECP" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="hu">randevu beta webkonferencia szolgáltatás</md:ServiceName>
<md:ServiceName xml:lang="en">Jitsi-meet</md:ServiceName>
diff --git a/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 7828cd5a..00000000
--- a/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://refserver.new.ox.ac.uk/shibboleth">
- <!--
- This is a "New College reference manager" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-14T16:46:50Z">
- <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://refserver.new.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAItsMlvuKT4IMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnJlZnNlcnZlci5uZXcub3guYWMudWswHhcNMTQwMTE0MTEzMTM5WhcNMjQw
- MTEyMTEzMTM5WjAhMR8wHQYDVQQDExZyZWZzZXJ2ZXIubmV3Lm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnZrPEqAQHxxuuiaezoehBHpU
- NawZ3YVrRODqy6xwsr8QD/12/q0q4QbY1a+PR/PxApAQDkitQwS+a2rRpxwoy7C/
- enwcamAD6uFz7v1LYav6zqpZvlDq86R10TBq2RGXhw7gyIQh8BrVnS2JCfgatn5E
- I7FX3Fr3J20K/gffhULR0BnegUM0V/TGRRSgHyIXvB3mpxpg/dSm2zfSV3bSkxjp
- 9XfRaM1y5stVVYZX+9MEqtMehaqashrhMmZH+Q23viQKXlnK3MQOGZ9cvV/QFndL
- 5GXp0xEevx4e3cDgYpGmnB4c68KTEQ3YPInzXXvc45W9mDYhyL0HTIJL9WisMwID
- AQABo0QwQjAhBgNVHREEGjAYghZyZWZzZXJ2ZXIubmV3Lm94LmFjLnVrMB0GA1Ud
- DgQWBBQvMIkjuod+Da1WtFejwhAJgqa2QzANBgkqhkiG9w0BAQUFAAOCAQEAiAOq
- cNyzyuzytSQuC86ZMmT7Xp9nIIf620PdY+G7dIUnef3vcUz4pclZ0rJsx0EwjqW3
- Y85Is9c781dqSnSaRRUrcnb+gQlQG0WT8xLyrwbaMLeIlU2c5plESfPcyMGothbR
- QeslfRUPQlDHfdNDegs4QzDAg2FNIjU38nrQ2tFEvqXcIzMKJaw79j2sZjt9aI2R
- jCvGboxIJuuy6zHBiB9Y342szp4QckSwdMw+bqdW/bA+redm3bMeul0Wo5JdOE7z
- iHiKjF+ReWFUDsfw6iItWOSgeR015KNrE0lmrbB6JHQ+pK5V196zFfOA1zDoFtNr
- T76PuZpBItplf7PXbw==
- </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://refserver.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, New College reference manager</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml
deleted file mode 100644
index 5f55c0cc..00000000
--- a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry.shibboleth.ox.ac.uk/sp/ouls-ezproxy">
- <!--
- This is an EZproxy SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-24T15:16:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFIDCCBAigAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBwDEeMBwGA1UEAxMVZXpw
- cm94eS5vdWxzLm94LmFjLnVrMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jk
- c2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUQ2FjaGUgU2VhcmNoIFJl
- c3VsdHMxGzAZBgNVBAsTEkJvZGxlaWFuIExpYnJhcmllczEuMCwGCSqGSIb3DQEJ
- ARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5veC5hYy51azAeFw0xNDA1MTkxNDM3
- MzNaFw0yNDA1MTgxNDM3MzNaMIHAMR4wHAYDVQQDExVlenByb3h5Lm91bHMub3gu
- YWMudWsxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UE
- BxMGT3hmb3JkMR0wGwYDVQQKExRDYWNoZSBTZWFyY2ggUmVzdWx0czEbMBkGA1UE
- CxMSQm9kbGVpYW4gTGlicmFyaWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xl
- aXNoQGJvZGxlaWFuLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEApfyE0QKZIyAWjyeQX3u6j8VerSbSJedbx7Xpe9xeYKO+jofSaYCI4vER
- EktCBcydO8Thbb4FG5+Dm3UbFvL3HaoJ1kwRCPe2s6DIjMkSQgOOmJXI8uv/Fo9+
- WbeQMSBkh3eguj7UfUyYf6X0rEDthba26UgK2A961uxhjtjBiJxOvE2m9CmA/7lw
- fNUQo/kVMj84Cx93CSXk4ErJOR+tkz9fLsXCmD+Df47b/pBHg/O26cs/LW8kmcsL
- rS9+C9elxDuCjyxsmwufXUfxKfXrXDuWKm1ttTn8YS72JeF7WOvkTWqRfPZfsyT+
- vJoSB7defi3ewxXEmQ63TR+YfI1u/wIDAQABo4IBITCCAR0wHQYDVR0OBBYEFPbM
- 9KZMKtal5T6yuLnxqwAh9B6xMIHtBgNVHSMEgeUwgeKAFPbM9KZMKtal5T6yuLnx
- qwAh9B6xoYHGpIHDMIHAMR4wHAYDVQQDExVlenByb3h5Lm91bHMub3guYWMudWsx
- CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
- b3JkMR0wGwYDVQQKExRDYWNoZSBTZWFyY2ggUmVzdWx0czEbMBkGA1UECxMSQm9k
- bGVpYW4gTGlicmFyaWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJv
- ZGxlaWFuLm94LmFjLnVrggEFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
- ggEBAA7f5WlR21SqJJ23OtP/Hxeo3jmmm5LRrjfdftTiXWrVQdGmj0znEEZK3feS
- VOdJucmpuwUha9y7IwcJSW5cpNON1EgNAEFJBk3yVc/QJFBI1GP4cz+LeYuGQ78y
- QWhC1dCTzrmkZ8GPgp01z3T/Fd/alcmPfi+jakFVNVBzo438HdGp83iYOT9ZZ3wS
- 7GvWeEI9pCF6+FLSVo7lAwCdKnUz+I2QwShkVM5qz1XTwBz5r+8hSIUkjYsHnzej
- xSMRZgfeIDO98i9fIEp6Mv4OIj7bVMTNmC+VJoKpu/T2PjuD/KHWjPouvRmDz4nu
- OpGViTGdF0S5kv2uRj4LZ+tfkm4=
- </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://ezproxy.ouls.ox.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezproxy.ouls.ox.ac.uk/Shibboleth.shire" index="1"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Oxford University: EZproxy Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ouls.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Mcleish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>Mcleish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 32856eae..00000000
--- a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repo.nsms.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:41:58Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAL0apyznrmFdMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnJlcG8ubnNtcy5veC5hYy51azAeFw0xNDA0MjUxMjU4MjNaFw0yNDA0MjIx
- MjU4MjNaMB0xGzAZBgNVBAMTEnJlcG8ubnNtcy5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBALZontMMY7ZVutHk9dU2b20uFGvoDoXIGTVY
- zqXI5Z3QhWz8nZ0eWPoxRd8Bk8NhVvLc1yQ3PcFXWIe9YtdATvlQCdRjrWUvRmOt
- FBfB4pKU2LVt1goVRZSr7r+EO0yW3clMtK2LJxzxmMYX1Bodx2HMDeDI856v6U1l
- rK+NiGWx7rbj+NtgInQkIWTeHpEWuiWbbbPTikBUNlnqVOOebZAWxW53PNekENzS
- 8fvLAt9clhDvdh21raqlWXlMd3Uv3uxs3vQrvEVstT/K1Ba1zZay8Nu3kBmlWT39
- KLKvlhA4d9RZ5RZCpSgHjA3J3x23cvv4Vr2XVJfN3fvtGpY89PECAwEAAaNAMD4w
- HQYDVR0RBBYwFIIScmVwby5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBRFVnTingt7
- M2lVTnK1KceB7L0uVzANBgkqhkiG9w0BAQUFAAOCAQEAblejPTxWn4YhyqGHdrhc
- ZpxaDshVRatbNS1SbDCgIxyq3xxVBnnEHdpClyPOpHUkndAzcggOI1e4IBDCuOW5
- wG8kYaNHY+DMmbHzKn98lw81C+GuFdJOItu+PGModOO0YbpQOG9Nr9C/gj+zKpGn
- GGAGaT7oqzWlIjvKrUB637afxa+2J5NqYIP6sC7n8HTToAjRSqsdS5UnKDiQPueJ
- 2LL/tGKw+ZPMBwQTAT/8JwWuLTAMCVmSA8jYeMs9ojVopgDZfhefsrbUDQQ2BJrF
- UK2XQQ615BPS2VvrQ5yDpfPpT6W4IUf2fuTG6/tGecZWZMICz8HakAZtXnKKEs2q
- AQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - repo.nsms.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
index 0a0781ff..312cc0d9 100644
--- a/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
@@ -55,7 +55,7 @@
<Organization>
<OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
<OrganizationDisplayName xml:lang="en">Newcastle University: Research Tools server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>ISS Helpline</GivenName>
diff --git a/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml b/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml
deleted file mode 100644
index 731855ea..00000000
--- a/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://samlidp-its.ocad.ca:8443/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-08-14T00:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.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">ocad.ca</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">OCAD University</mdui:DisplayName>
- <mdui:InformationURL xml:lang="en">http://www.ocadu.ca/about_ocad.htm</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAPRpRT0TrCPgXOSWUxrZTtTEeomRMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0MzAeFw0xNDA3
-MDgxNDE1MThaFw0zNDA3MDgxNDE1MThaMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRz
-Lm9jYWQuY2E6ODQ0MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ7X
-oFLpNI6mfEuOV2Y0Jx4dVi2t+VDHUahlmlf5r2IAascQMuJDmmAGgoq3SDQHcpvA
-R1JkEgAx8hAFys28faaWxNyfQezZNha/WflMEdcnMPGDKpSuH9zqZnkwm/7VwEIs
-JH+14u4AnjVAZTZdHtl6DIPvUql4GImhOW8SRQeriVhBtInqnCA/AKY9UGKK4JIr
-Fno/Opmqjo1T96gSiioyfGUhSW3uPzmFj8Xabl0xUt06EjkFMP/p91+vgzIEvg/9
-PMval4Mw0i/syuMfVG6QHQRfWszuIuSyxVbg65jINkeySHpRkQWelp+E2UDy77vJ
-zJk2SK+YzgXYtfHmr5cCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2FtbGlkcC1pdHMu
-b2NhZC5jYTo4NDQzhi9odHRwczovL3NhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0My9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbJEIUMmVvHdI5G0vBFKtNUKz0bcwDQYJ
-KoZIhvcNAQEFBQADggEBAAPkUGthYxClJBy88O6uAq0WSObQ3w6Usbw2tRG47VQP
-UHe3sTXU/UgXKjQrgRDvMoyNW9y4EBm/+7+THAhTRTAISlhixId06csKJ3AW5WWS
-LVrezH22u+9M28AnTnxgH2BbhwkeSD6YZsPPXOySK6ivADlwPjgvxr4jxrZ4ioRS
-cQX0Ii9rS7spjxCmbicvlVfXl5Oe79NdtO+NcxQbRfU3QYHZap0lDVaZd+6zLXXU
-k5TIaeFkSh3RLdm4kBlaLFXzepvESschTHTfbH/PHntSGOYJVRGV34yKUEaG/mSQ
-KA9ippT+XCdKL7aFElL/FkA9Welvsk7w/EHZoo8Ixls=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca: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://samlidp-its.ocad.ca:8443/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/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">ocad.ca</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJDCCAo2gAwIBAgIDDC/fMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDkwNzI5MTM0NDQ0WhcNMTEwOTI5MTMwOTEy
-WjCBrjELMAkGA1UEBhMCQ0ExEjAQBgNVBAoUCSoub2NhZC5jYTETMBEGA1UECxMK
-R1QxMjE4MTcwMTExMC8GA1UECxMoU2VlIHd3dy5yYXBpZHNzbC5jb20vcmVzb3Vy
-Y2VzL2NwcyAoYykwOTEvMC0GA1UECxMmRG9tYWluIENvbnRyb2wgVmFsaWRhdGVk
-IC0gUmFwaWRTU0woUikxEjAQBgNVBAMUCSoub2NhZC5jYTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEApHxUZXD1VIVnpsVhmLRbKiUcf6ANdA7pbSwxCMECl+wu
-JhynMaHhiCkED8nWTkGAZ9ueSvcd8PURDpFHMFfsMPr1Q5ZN22fizxEP4+G0hbs6
-loh1WJBzJUuYXFtLftuSzOCJ1VhI00l2+38sjAWLDrJlRrIDl+lMFa6EpOy8LacC
-AwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFEy0g9UjmGGasnEQ
-BNdtChLTXsi2MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3Qu
-Y29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQ
-TzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQUFAAOBgQBl1lnGQv6nOHC2Y/IyubqnlOBSW5dbSFSn3pvrxvuL24b1MR0XA+28
-hui8jdimOzGIOWS4+ShIXaO6rAaugPpMxFU+DArOHPJ9xjolw86bFdh6Z1xhLg9P
-lOKqmQXDe3+pEod35AFdmKjRVSbliDv5BZ2lN7GVDTzea0f66nblvQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca: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">OCAD University</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">OCAD University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ocadu.ca/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Matthew Kwasnicki</md:SurName>
- <md:EmailAddress>mkwasnicki@ocadu.ca</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5ca67bfa..00000000
--- a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sant-ssp.sant.ox.ac.uk/shibboleth">
- <!--
- This is a "St Antony's College" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-08T17:02:08Z"/>
- </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://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAMhwD42RejeVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnNhbnQtc3NwLnNhbnQub3guYWMudWswHhcNMTMwNTA2MTM0MzQ5WhcNMjMw
- NTA0MTM0MzQ5WjAhMR8wHQYDVQQDExZzYW50LXNzcC5zYW50Lm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTP5u2MTtwDgk9nE/YOMLyBq
- kdM0PgaJ7CsZmtf3kynVVet2TCudVGbDPzz0ucLUGvEf5gFtJSmKNtBHS2dpECN3
- v/tQyeCiaDxVvlpgAMquKStWxPP6/jRS0jk+QtIEzNlMqD9QQ1Y6GZB1hTK9uAXM
- CtwYZkiwQlDFtygxQO6IMmYidVNmSGGX8WPmwKypijBwpPtLoEA5r2vj6yDZ6d/S
- 0+4w4oaXHIYJ/7i6K/L15gXeN0UG8Cf8eOrU2VKGfdWtJF1TbLlBEiMdfLMDfe5W
- Q4xRldVXO7rvdHMSkIUw2+qehAzFYRdGOBH5OMZak699Oqcx3qLfRQP7LMgPtwID
- AQABo0QwQjAhBgNVHREEGjAYghZzYW50LXNzcC5zYW50Lm94LmFjLnVrMB0GA1Ud
- DgQWBBRmXuxwJcoRmVF9892XQF5+JbXQ/jANBgkqhkiG9w0BAQUFAAOCAQEAbcG6
- cPqRKjU4ErmifQX4WGhI7VI1cef4Un1kKDSHVj7/ons5ZSUqbHFwnM9m2NRsrRGI
- WchHAYkVnChDsRPIGrNURK1AqOE2xEo/1C2TeKWZF1wWs+xpPguU5IJO+/esIdwn
- JtrLlTDk3mlB3bfF2ztvoAHN3UBy+WEfIw/eXdKFEyGQzR2OAAZuKIEOJ3WY3UGR
- bq0VNxsBVKEJFDN4/AdTPVFyhsDEHYyrQ+z/oiZqsif3QjM7vB8AUXcqUDMNKnpt
- S/rurkWwA1QuSeIejchaeEijndoSyqUMeTq7IPVoiZ/yUj9fFoh7dNt0uj9E0paJ
- 5gefI6a4f/mL0eFXGQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">St Antony's College Shibboleth SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>St Antony's College IT Support</GivenName>
- <EmailAddress>mailto:it-support@sant.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Christopher</GivenName>
- <SurName>Hoskin</SurName>
- <EmailAddress>mailto:it-manager@sant.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 527d538d..00000000
--- a/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sawfish.conted.ox.ac.uk/shibboleth">
- <!--
- This is a Conted development site Shibboleth 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://sawfish.conted.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAKibhIeIrX0OMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3Nhd2Zpc2guY29udGVkLm94LmFjLnVrMB4XDTExMTAxMTE1MTgwOVoXDTIx
- MTAwODE1MTgwOVowIjEgMB4GA1UEAxMXc2F3ZmlzaC5jb250ZWQub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqzfHO6TPn1IpvOvkGXB6
- hdiMh61norAph+ZTqYFeXKdFI3ifdf1i52vBa4ODsCFJlgxow1+DkOO7/3Ipp4h6
- k2xP7Vrll7cNkC80jh+/fENc4OVXBoPyNGREpLtsIHaV82cUImjEiCtjOtmA/EeO
- QDceq/cRPfKnalntdynhPGfBKV5B07+sMYaYyfwRp2hu2OdZzFWdJqCAJ6kFxw+E
- hFr7P4TfrMm+4ESvfjN31IpT6ak0AJk3CckpXmRgM6i5lQv4H+DXYQgOWrvIISdU
- L6FRTKlIQ++57A9FV/UJVWRz3FGW8NIb/7NdK+u9N1z/4YTK9PTwDAwY8iQi3gX1
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Nhd2Zpc2guY29udGVkLm94LmFjLnVrMB0G
- A1UdDgQWBBRDY6WGUq5Zg1sxv81m23/toHTbSjANBgkqhkiG9w0BAQUFAAOCAQEA
- XP6+tO+WyXfIXIW9xXVt+uQvjMDm58zMG4lGE+PC89lk0itPmciDMgMSko0Al3Ev
- NMpnTh0JSmZipjOACprBt9s5ykhWBybE0Blid2TN+42tGzW2RUW7PhJbsqhF16v4
- o4WkcJWOyhVDhzDckPu40VZ5lQSIVVrZHEegQXVPRy+lupq7lz5cnmVTrwBHk9yG
- zIiW5643Vuv02Ma83i9eWPfruX5z4LZzLPYz4Jv/CfoIinqbj9EPmTYVl5oRm4HC
- QdQJumsqcKAGRRjW1vvKET66KjehtL8C9hqVxyAKc5b95A2qq4WtX01eejeJLYO+
- mkBQ7rIcTw8YYbUpVUyQVw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Conted development site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT support</GivenName>
- <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT support</GivenName>
- <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 83f400b3..00000000
--- a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sbs-webhosting.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-06T09:27:25Z"/>
- </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>
- <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://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
- Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
- X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
- Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
- 6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
- 4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
- epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
- EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
- Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
- 9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
- Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
- fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
- RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
- 0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
- uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
- </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>
- MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
- Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
- X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
- Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
- 6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
- 4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
- epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
- EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
- Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
- 9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
- Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
- fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
- RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
- 0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
- uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 1afc0219..00000000
--- a/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sbsintranet-prod.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School Intranet - prod" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:51:17Z"/>
- </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://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHjCCAgagAwIBAgIJANdB9eXrYLgxMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHXNic2ludHJhbmV0LXByb2Quc2JzLm94LmFjLnVrMB4XDTEzMDMyMDExMjYw
- OFoXDTIzMDMxODExMjYwOFowKDEmMCQGA1UEAxMdc2JzaW50cmFuZXQtcHJvZC5z
- YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChX2rJ
- z07BWAA9qBYJttygZiFvA4P68EyXKHVKJP0+GQkVbz+QWgiakqrUJ4ug/2t7WZqw
- AYGboWfEF7fn1RTk/Cmb2qrbZnDbw91K5kBq9UHm40EVGKAvbl3pH79PvNltXm4R
- rRmFU73w9qiSSYSoJw+H9aVwoulz6SNcgT5vBL9yU3WBbVL5UUZ6Ar0NA4MSKt1M
- s2Di56Bj7/yruiS/IWvYEdwwviOlfwv2zNOSq5WE6+3JUjmENVIaeD2quR72jl8A
- +A5/oCejuRxA1MXtW14c28kcW8WAq+jJNhZTyTz9J747SfjwevvZC7ZpJiHpLQ3E
- C5ZlCMmqBkkpXHG7AgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic2ludHJhbmV0LXBy
- b2Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBQK6qQ7cJpaQHEchczSL1pO4sUdJDAN
- BgkqhkiG9w0BAQUFAAOCAQEAgQSIM4wPZ/toneOiC8SOGTAQCLXXKLhAExgtVYt4
- iD21kD77ltKjTnexFoEYZYhNYbpvjryLjoUwHNN0vkefEILSJ1AROtAtqrVRe/eq
- BFSJUPEc9ldfaZyHfHm0HlXw/IqkB8Xwbl/pxeuk9UpANSK1BJEVF7fQ2OB+Q9tY
- WfbpayK2H+et/4GqNBArhbaPTc24UmEg4iSMKM62px4LAFHDyY+l5hPyZIjbjaH4
- PyOioUMLHQD7AFqiiudIMbHIexs1H8m72DY04eOfS0LbPKWjjQfnIvza4jrk5QVg
- Pk/JmOFKxpYp6MjeyevIyqMKT75dQqAph+dRuPdrLpw3uQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c97a8446..00000000
--- a/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sbsintranet-test.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School Intranet - test" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:51:45Z"/>
- </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://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHjCCAgagAwIBAgIJAPI8dJKkzOVWMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHXNic2ludHJhbmV0LXRlc3Quc2JzLm94LmFjLnVrMB4XDTEzMDMyMDExMjY1
- M1oXDTIzMDMxODExMjY1M1owKDEmMCQGA1UEAxMdc2JzaW50cmFuZXQtdGVzdC5z
- YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYJfL7
- 38MTfaNtX2gG3YT22obvOUO4CBPVBAy6kpRIoph8N7TnRqFquy/W9ml4eAX4hUD+
- BB+mDDaSNxKfHgBu6IItHr65Dlpr1SoFqkedhbc62MwQBfTstT0kNZAfDrMs4Uzn
- RWpcVQ57hsIzpIFglN4+cIr8RxVtECnjOw83OXSmT5Mr4kzBkZXaHfwZBEtY7cKA
- k7GOY+NoeBiZ1DgIpHDpYi/r2YJYaRUyLliEcb9Ub2uc+C9aBhdhOn7/E/BpMn9w
- jvW0TMCFqUQN/oV9fyoeUUx5raCSinh7rjrYefxu+tJ5Fo7IyXq+oE/B0eu6ofPM
- E92JNYaN4aco80SLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic2ludHJhbmV0LXRl
- c3Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRs98UMkEznWm8oWFvOszcJxU6CmDAN
- BgkqhkiG9w0BAQUFAAOCAQEAxeGvvr413wr+UGJexIedFITpLxgAG4F3YUeEXYsm
- ol+WU2ekOFAge5nNj0Io8UmoTHpEIMXg62OSDWyTkAtpWYdIAdUoL+42lLrdTSr6
- sbjZdXHQcSp+5fvpEuYkm3L0yCQktNy5J2dZ2dhAJOP+qf8V2G18TxkVQBmWrBW9
- no1TMarB/+B7solMtdlyN4JUycjEP4wiTpfvxMdCtBXUDRMzZC1fHe8D77N97TwB
- auw5Unm40o1QfOlAsaIC1jGRjFVcQ3PEo8PRFrExKCn33xDWXqLDPLP6pQUxxItK
- 1fSI3rsM+k375WfV9e/ofVNzCZ1FWe1GqB0/yu/x0I7M8w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index b20c443d..00000000
--- a/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sbsplatinum-prod.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a production "Said Business School" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T14:21:19Z"/>
- </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://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHjCCAgagAwIBAgIJANgO33fFtCcXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHXNic3BsYXRpbnVtLXByb2Quc2JzLm94LmFjLnVrMB4XDTEzMDYxOTA3NDQw
- OVoXDTIzMDYxNzA3NDQwOVowKDEmMCQGA1UEAxMdc2JzcGxhdGludW0tcHJvZC5z
- YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxsxUF
- O8JjMA3zbx6THu/sz0Ji3AlS8k4IqdAG/t4t5ZygUgU+gaTrSC9kpD0wg9WvE1Py
- ZW/ogfB8KiAkfSbUi16O919f0uowJmUUYz2D9KjZJiVq2CmDUUyryEKwe94TR17M
- rVLMg2UxhSP7n2uT4VuZTaC+37MUDmE/VOLon7qN/mXYWCXJJyPWEbWjev6WRZ8t
- LkMgqDUPlpt6hgfVnQKAJ7cJteULGGVp4gCb5Ezj91o2LBTM+uzKCIeJAo6Avm18
- SKSFgqx+oxQ8SD6AAuSrdwf5fwO//I51N/9uj8xtgO7MA4tN3epUXRtJD+j/LQd5
- mDVcTJUmZnpWvWrbAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic3BsYXRpbnVtLXBy
- b2Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRo8x/YSzthXDfDcxhd2ZUvbJKGbTAN
- BgkqhkiG9w0BAQUFAAOCAQEATbUWqGmTXGv5wlEYF0b0cm4Zwp/LPehRLpH5gYai
- XRa/STYpeQvvRBHHiDVM64PhguE3yZ3+SxUVXdqRKJz0uTjcXZ+CHhngw+4VKW6E
- eqSchBsjbPj/ETSykfoI+sQsmEWONYRO/zFbNrZe+rPL4QW1ZOIVZJ8xa+eZuQsS
- AlWBC0vCmI+zMjDlUQuLquZRDchZdotqjbv7Ct1Tj9iIGOK053EIl14AILzsN/li
- f24euHknRDl0vq3AIWYr+PO3m1B7ePD1ZQ4IOgvM+4GciI1WhjTZNvp1wIbfBfgZ
- FNl6Gg44YYASw44hQ6PiTIcOCq19poc5h6W/PVSnhMFIZA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ffd2b3e7..00000000
--- a/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sbsplatinum-test.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a test "Said Business School" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T14:25:35Z"/>
- </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://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHjCCAgagAwIBAgIJAIgYFNjAnI8eMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHXNic3BsYXRpbnVtLXRlc3Quc2JzLm94LmFjLnVrMB4XDTEzMDYxOTA3NDQy
- MFoXDTIzMDYxNzA3NDQyMFowKDEmMCQGA1UEAxMdc2JzcGxhdGludW0tdGVzdC5z
- YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCflklY
- AT1EVMNRPCXm3sOtAlwJDoogJBj40AyzlvY1aj/jviEd048i0l5oYQ/Y5K7AJlML
- 9XA2ke/k6+gHsY9uglMCSY4nyeScfRdU63ZrH72D8OzkMM5sTHITyd0UYtXQfl/a
- o3/RjnZBwarQZ4BVmSuU9KR1KHuJEaUEq3NAClcy6CKNVcJA/DuN7NyL0ib/Ihd0
- LHN+bZ+3s34nw0k7URxyLUJPZegofLUa1i8CmKqTc59rkRtR+Akiy9cOdpWYPZgw
- P967o/ZlTPH5emZ6WUjFKxd6ofr00sipRrIZ8ZyK6LOd5n37pIJ12yh7aDna3nlU
- T34MBjPE33mzL2ifAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic3BsYXRpbnVtLXRl
- c3Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRLBQqOm4D109M7QY2GgFO/wHFMyjAN
- BgkqhkiG9w0BAQUFAAOCAQEAMfbJ0CGrfs6yV/K5LCFZDzIRkI6x+524ghvZbI3P
- 6+GI87D6gZ+QTxta29tqlF9ZlAMtIgdo+XYoRLephxPN5Xo6wbw2ku/U7cBcDrzD
- MiBwpjCWzhcfIyu7pxEaU6qvuc+EAxBDjC7w388bp28FFyMPaKPfKEZ/7BKITo6K
- i7kYtYbV9ZwSj5yAamnbMtgI0abgpQ+7UqoNV9afIABRbnVzfmMqFxvSrx07x4FC
- 73qtZeNIxo0mTGRa1eU9hyImd8BX5uoy1TQikkBGmXAXTS0AFbOZYLYVsQn5eNNj
- so5f+e8LVT91d0XnbqkBqNlepWrI70hiDyeSNXgeZvtkAQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 11f2c2c2..00000000
--- a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.ibisworld.co.uk/shibboleth-sp">
- <!--
- This is an "IBISWorld UK" Shibboleth SP for IBISWorld.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T09:34:41Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IBISWorld UK</mdui:DisplayName>
- <mdui:Description xml:lang="en">Welcome to IBISWorld, the UK's richest source of business and industry information.</mdui:Description>
- <mdui:Logo height="48" width="158">https://secure.ibisworld.co.uk/img/logosmall.jpg</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://secure.ibisworld.co.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAP4Fp5haHFgMMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnNwLmliaXN3b3JsZC5jby51azAeFw0xMTA5MDYwMDQ0MTVaFw0yMTA5MDMw
- MDQ0MTVaMB0xGzAZBgNVBAMTEnNwLmliaXN3b3JsZC5jby51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMQHhKOh5tWySehDDucIlkK15NotzimeWOnr
- 1QklBthu1UJa07hTqrBw57aMHuJ0+WI1KSz30/xfwk3mv8sB3HvSCgt9HhwFeVnJ
- 7jMmZF/MNqI/RXFtCQdVmGyBNhhU/C2n6zDVYQE4f9115r4iIcxpR6ddbL3s9B1I
- 5UDDhTTOkFXrnfdyaPWfhANdmLbjO386S5o0IdeS5+WilyEHO7Gk7tKwi4Qn9Jim
- tnDz0UFuMgRS9yiuNepiXhReEO2QwYRw+tDfmDql3bc+lRzlaqFTX4AbJh6OdMrO
- zcPPjsHMnlCwDyg81UYSkNsfyUjswp5UYfZhb9KAMKyXNVLcs40CAwEAAaNAMD4w
- HQYDVR0RBBYwFIISc3AuaWJpc3dvcmxkLmNvLnVrMB0GA1UdDgQWBBS3kV42C8Eb
- 2/LQ1U4eh6whZrS6TDANBgkqhkiG9w0BAQUFAAOCAQEAuhXSnv+l5lcCYuhfhZ2N
- QqAgP+4kETNy9DSiOJ65IrRP8udPrC89IXfL5ypHO8fdhNOCxI8krdIH64Jm7lth
- vDck0+gkDGLAeXVxEDczwP8O3nNWdC+fNWTgIAkyXLDS3jhJq/cwHvW1jJRdyJlQ
- ltUXRoyxRkveiAx/M1pMtUkJGGAwAvcwutr8poLb/SwMgqnSSyDga+zXpwYqrZ8V
- taIO6RtXMxMf+yv3uebcJiUMAUZExF8G4h6rIPSAt2Xi3oDAavBfo1ZRS0esJUL+
- QRuvgFY9tYDxs2vrZOwMut/o9z69OWvnQoV87PqJAH1KjIQSClzrY9gj9k0aPiva
- 3w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">IBISWorld</OrganizationName>
- <OrganizationDisplayName xml:lang="en">IBISWorld UK</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ibisworld.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IBISWorld IT Team</GivenName>
- <EmailAddress>mailto:itsupport@ibisworld.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Robert</GivenName>
- <SurName>Sells</SurName>
- <EmailAddress>mailto:Roberts@ibisworld.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
index 6b58d1de..c3d1e542 100644
--- a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.palgraveconnect.com/shibboleth">
<!--
- This is a Palgrave Connect OpenAthens SP for Macmillan Publishers Limited.
+ This is a "Palgrave Connect" OpenAthens SP for Macmillan Publishers Limited.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T09:56:41Z"/>
@@ -44,13 +44,13 @@
<OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Mohammad</GivenName>
- <SurName>Nawab</SurName>
- <EmailAddress>mailto:m.nawab@nature.com</EmailAddress>
+ <GivenName>Chike</GivenName>
+ <SurName>Abia</SurName>
+ <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Mohammad</GivenName>
- <SurName>Nawab</SurName>
- <EmailAddress>mailto:m.nawab@nature.com</EmailAddress>
+ <GivenName>Chike</GivenName>
+ <SurName>Abia</SurName>
+ <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml b/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
deleted file mode 100644
index 671f7411..00000000
--- a/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://serviceregistry.oerc.ox.ac.uk/simplesaml/">
- <!--
- This is a "Service Registry" SimpleSAMLphp SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-26T17:45:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFCTCCA++gAwIBAgIJAJMYOQ/+WX4fMA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
- VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxDTALBgNVBAsTBE9lUkMxJjAk
- BgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcN
- AQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTkxNDE5MTFaFw0y
- MTA1MTYxNDE5MTFaMIGyMQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hp
- cmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZv
- cmQxDTALBgNVBAsTBE9lUkMxJjAkBgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJj
- Lm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51
- azCCASMwDQYJKoZIhvcNAQEBBQADggEQADCCAQsCggECAsypwS5qHz9mQhrwO7Ij
- rtstJaTgrcuhP3S8WDlonzdTW7CWOAaUQVRpp7sOJ8o1ikA5XB0aU9ORyCu2jJOZ
- zlVnSP5ev88JcGFTUgsWHCQ9YCS6kJFnMhnxrWP1Xr3hdmL5TVU5SEaWzINfRxNu
- i5plV62UwuWImwVUcQ2h/kvU1GSzuS7BAH8fvUZ/bfiaCKEvmfD/PnfE/etWpil+
- X3WrL3MYlbVcPPndHDr5w+Vk/ffzYoH19/Dqu12/iVboR7zUSrj51bojPlHlx4JS
- el60U7gHm0muN3KPVgWJQvcyLphBEpID0zm2Zw+7+/DG4c3laJLeYTds0tpS2pBP
- 7FzfAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUiVhE6lTDYudFqofjxhNzqqQEjz4w
- gecGA1UdIwSB3zCB3IAUiVhE6lTDYudFqofjxhNzqqQEjz6hgbikgbUwgbIxCzAJ
- BgNVBAYTAlVLMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3Jk
- MR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzEm
- MCQGA1UEAxMdc2VydmljZXJlZ2lzdHJ5Lm9lcmMub3guYWMudWsxJjAkBgkqhkiG
- 9w0BCQEWF3hpbi54aW9uZ0BvZXJjLm94LmFjLnVrggkAkxg5D/5Zfh8wDAYDVR0T
- BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQMAAFaAy6JCEMZESspH2sDJ+37EmnCS
- Am8e961gQd7OBlNXjqV8K9+Qrt18YAXKWwq7s1A19+96Ui1Uuc8swDRNIYdg76nV
- Zip44kIDpk3g98Dth5zJ12BRJkd+hkR9TZ+7rOHdMZB2Legn6/hWK59PDHZCOLMq
- 3olFW9tmuxO/MTw3ZAVcitKR3q/amlCesr907AY5vnfd2tyVN3c65pY4/nEjNYpc
- 61bbwWt6x/xnmBlwdx+jNjdn8d2mHctH+1lBi3k8g494Aa27yX2t8NkGs6sk3x6j
- vXs3buSo2iGEY4/5JsFSctsHW8yaW/nRJXKVYM/0r0m5duuXPBhRFWpkEfNU
- </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>
- MIIFCTCCA++gAwIBAgIJAJMYOQ/+WX4fMA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
- VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxDTALBgNVBAsTBE9lUkMxJjAk
- BgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcN
- AQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTkxNDE5MTFaFw0y
- MTA1MTYxNDE5MTFaMIGyMQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hp
- cmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZv
- cmQxDTALBgNVBAsTBE9lUkMxJjAkBgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJj
- Lm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51
- azCCASMwDQYJKoZIhvcNAQEBBQADggEQADCCAQsCggECAsypwS5qHz9mQhrwO7Ij
- rtstJaTgrcuhP3S8WDlonzdTW7CWOAaUQVRpp7sOJ8o1ikA5XB0aU9ORyCu2jJOZ
- zlVnSP5ev88JcGFTUgsWHCQ9YCS6kJFnMhnxrWP1Xr3hdmL5TVU5SEaWzINfRxNu
- i5plV62UwuWImwVUcQ2h/kvU1GSzuS7BAH8fvUZ/bfiaCKEvmfD/PnfE/etWpil+
- X3WrL3MYlbVcPPndHDr5w+Vk/ffzYoH19/Dqu12/iVboR7zUSrj51bojPlHlx4JS
- el60U7gHm0muN3KPVgWJQvcyLphBEpID0zm2Zw+7+/DG4c3laJLeYTds0tpS2pBP
- 7FzfAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUiVhE6lTDYudFqofjxhNzqqQEjz4w
- gecGA1UdIwSB3zCB3IAUiVhE6lTDYudFqofjxhNzqqQEjz6hgbikgbUwgbIxCzAJ
- BgNVBAYTAlVLMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3Jk
- MR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzEm
- MCQGA1UEAxMdc2VydmljZXJlZ2lzdHJ5Lm9lcmMub3guYWMudWsxJjAkBgkqhkiG
- 9w0BCQEWF3hpbi54aW9uZ0BvZXJjLm94LmFjLnVrggkAkxg5D/5Zfh8wDAYDVR0T
- BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQMAAFaAy6JCEMZESspH2sDJ+37EmnCS
- Am8e961gQd7OBlNXjqV8K9+Qrt18YAXKWwq7s1A19+96Ui1Uuc8swDRNIYdg76nV
- Zip44kIDpk3g98Dth5zJ12BRJkd+hkR9TZ+7rOHdMZB2Legn6/hWK59PDHZCOLMq
- 3olFW9tmuxO/MTw3ZAVcitKR3q/amlCesr907AY5vnfd2tyVN3c65pY4/nEjNYpc
- 61bbwWt6x/xnmBlwdx+jNjdn8d2mHctH+1lBi3k8g494Aa27yX2t8NkGs6sk3x6j
- vXs3buSo2iGEY4/5JsFSctsHW8yaW/nRJXKVYM/0r0m5duuXPBhRFWpkEfNU
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Service Registry SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
index e163c715..0904fa3f 100644
--- a/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
@@ -42,6 +42,9 @@ TG5a9eJRJRp7O8KekUdkn17tzldLodiuduABA/gncseSrDLBUJntriF3yGGbCdJz
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sharav.abes.fr/idp/profile/SAML2/SOAP/SLO"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
index 34e26cf3..45efdd57 100644
--- a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
@@ -28,40 +28,41 @@
<ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
-MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
-MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
-DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
-aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
-IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
-fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
-pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
-NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
-9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
-m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
-FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
-VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
-aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
-dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
-cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
-ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
-y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
-+B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
-a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
-u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
-N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
-nT7WnMt5n4CA
+ <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+BhMCREUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBH
+LTAwMjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTUw
+ODA2MTQxMjE4WhcNMTgxMTAyMTQxMjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNV
+BAgMDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcMCk9zbmFicnVlY2sxIDAeBgNVBAoM
+F1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVt
+MSMwIQYDVQQDDBpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToX
+pKBvfFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMo
+R2SupHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwf
+aDCrNqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGC
+ZPN39SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5m
+AfV2m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAtcw
+ggLTME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwC
+AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgwFoAUqh/YdxVumeRf
+kNbsYyZOGepnFFAwgZYGA1UdEQSBjjCBi4Iac2hpYi1pZHAudW5pLW9zbmFicnVl
+Y2suZGWCG3NoaWItaWRwMS51bmktb3NuYWJydWVjay5kZYIbc2hpYi1pZHAyLnVu
+aS1vc25hYnJ1ZWNrLmRlgg9zaGliLWlkcC51b3MuZGWCEHNoaWItaWRwMS51b3Mu
+ZGWCEHNoaWItaWRwMi51b3MuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVjay1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
+ay1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
+ay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCLC6KBPh3XfxcQzT3pEo6bRkBLfCvY
+XTxYyTLq37RwmfuLE8j9Hap+cvskfE99JtEHRwl/F8Uv9SSQgw+AbKs9xeTH7T5K
+zalw3fxaK4idLxaZKbIwHMxvkZwd4ES29XdXOlP3xAx/+3yQ3hg0IbCHaTywKx0+
+yyskKDqfOdlEYTKCQ3DeP30wtws5KGeM9q924XR6DlDjcsyG2PokwTk389q2ibpV
+TaZM7XbRWs5/gwBpj9NpzsBY1PkDD54mvLEFCYrlXAMszFyjQeDVXHayJ17WIDrO
+zYfn5UP+rfVyScJjmLxneyX4yu4iwS+Bv9CpJ/lBl8hJkf5YEJ+Tkr9b
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -87,40 +88,41 @@ nT7WnMt5n4CA
<ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
-MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
-MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
-DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
-aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
-IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
-fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
-pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
-NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
-9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
-m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
-FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
-VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
-aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
-dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
-cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
-ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
-y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
-+B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
-a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
-u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
-N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
-nT7WnMt5n4CA
+ <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+BhMCREUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBH
+LTAwMjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTUw
+ODA2MTQxMjE4WhcNMTgxMTAyMTQxMjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNV
+BAgMDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcMCk9zbmFicnVlY2sxIDAeBgNVBAoM
+F1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVt
+MSMwIQYDVQQDDBpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToX
+pKBvfFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMo
+R2SupHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwf
+aDCrNqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGC
+ZPN39SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5m
+AfV2m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAtcw
+ggLTME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwC
+AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgwFoAUqh/YdxVumeRf
+kNbsYyZOGepnFFAwgZYGA1UdEQSBjjCBi4Iac2hpYi1pZHAudW5pLW9zbmFicnVl
+Y2suZGWCG3NoaWItaWRwMS51bmktb3NuYWJydWVjay5kZYIbc2hpYi1pZHAyLnVu
+aS1vc25hYnJ1ZWNrLmRlgg9zaGliLWlkcC51b3MuZGWCEHNoaWItaWRwMS51b3Mu
+ZGWCEHNoaWItaWRwMi51b3MuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVjay1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
+ay1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
+ay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCLC6KBPh3XfxcQzT3pEo6bRkBLfCvY
+XTxYyTLq37RwmfuLE8j9Hap+cvskfE99JtEHRwl/F8Uv9SSQgw+AbKs9xeTH7T5K
+zalw3fxaK4idLxaZKbIwHMxvkZwd4ES29XdXOlP3xAx/+3yQ3hg0IbCHaTywKx0+
+yyskKDqfOdlEYTKCQ3DeP30wtws5KGeM9q924XR6DlDjcsyG2PokwTk389q2ibpV
+TaZM7XbRWs5/gwBpj9NpzsBY1PkDD54mvLEFCYrlXAMszFyjQeDVXHayJ17WIDrO
+zYfn5UP+rfVyScJjmLxneyX4yu4iwS+Bv9CpJ/lBl8hJkf5YEJ+Tkr9b
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
index e32dfac0..30c5588f 100644
--- a/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
@@ -8,35 +8,81 @@
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Burton and South Derbyshire College</mdui:DisplayName>
- <mdui:Logo height="163" width="288">https://shib.bsdc.ac.uk/mduilogo.png</mdui:Logo>
- </mdui:UIInfo>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDKDCCAhCgAwIBAgIVAPqc3rb7Due/A8SDksahSIV81mhLMA0GCSqGSIb3DQEB
- BQUAMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azAeFw0xMjA3MTAxNTUyMzVa
- Fw0zMjA3MTAxNTUyMzVaMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVOink2gWh8mkWeSVHq2r9YG1Tm
- MqJO8YLKq6iYGPLHgqBknI2RnbNOP2BbvRz6HpXOBhSADK6ihqs2oPWPgvfQSaaQ
- k0SPcObBaxoQf1obLqrckTQlsUMZpiYXbFqNQvxzvieRotPA+UDJypvpo7eoWjfR
- R7xgPDl+MyEGr0j+eg817H2ODl98TeP7wNkbct6ROxi/SRTv2G31lslOqpV7k0EB
- vWZhDTqdJ5QfOABXUIDJsiS0HGmQmF6r22X/eSpYgCPXoYbXJUzM0Kmxg5ak6MUt
- Cbf1l9RpY5z5CIOBjiImDI0JsJQFqDCIgEbHFJwxHayM04p+rgZOuaCSBD0CAwEA
- AaNlMGMwQgYDVR0RBDswOYIPc2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIu
- YnNkYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdGAiYrBrJg3eOSOb
- kV7aCm4GFm4wDQYJKoZIhvcNAQEFBQADggEBAAFPVigjx7LAJET1QnJQukSSJK7W
- 0EpEzBtVEA4OG7bEWcSc1vn4Jxzsceg+Q7QLPahg3isvR5NGGJ2sBC/KaOXZqI9e
- 6CkuUhu2bqJnsY7KvkTMt4H44WUzTx2z5YPhHWkIGo0F39MH7pKk3OMLe71BbLG4
- WFdm8pU2h+LDxCbGWnHqsuIr2C5hqvKKs77Pti7otupF2+6+2XOlE1bk3DJMGLG6
- 5i3cPVfbVjl/Ztn02yBxrgoVTKLqChuTcez6Af5eVptOkfnWcn9J3YedTv3P5CpT
- ymcVURb4Pl30AjdHCCwyQvSiuYZfdDSOolEVcnTZVvKK1wft5xLTTAb2R4M=
+ MIIDJzCCAg+gAwIBAgIUN8y30toYLjtWupKH7DVDzwSSKuswDQYJKoZIhvcNAQEL
+ BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMVoX
+ DTM1MDcyMjExMDkwMVowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
+ BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7cEKQ9U09f5UJt9PYlw4z+Cw/fuy
+ 1N+4xPkfibEj/EWCUMJ/dyqtkhmmsId8GdUzPJOXgE37oMJP4BYjKGJHcGz9Q2DP
+ EgSDPBVBexlQKyuIjVllaB0yCGPDekKL5PWXFbp6OVEPN+YNVEyJE6wQcqFK92Ml
+ QnywsKIEC6vsAeZzBRxYnUIioL6gMKgYynuKBfPo+uylPsakFQoKF5aiqH/fdIHL
+ MO17BiDQGfWyslSgDbL1YQqONvw/NtVjpLjWjnYw3SdmyvOM8CnDZFWwDOi3MWAR
+ dSrtdPVICwRIFUk0/t30pCoebJmXMEtiG3QmeC6dBRchcr/4mkX4QQaUpQIDAQAB
+ o2UwYzAdBgNVHQ4EFgQUVLuuZKNnpMw5MMO4MsJzkeDW9SQwQgYDVR0RBDswOYIP
+ c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
+ YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAV5Z154bfv7fMTvjs+mIXf62g/znr
+ JpCulJmY0ckkYsm6qpAp7jRaW3g8ZIqtwcrPWbflLdlJduFeXt3iHQzNKelCuTVQ
+ zaT1uku34qLw5n8dlLSJCAYTJ3k8DP9paZAHWQutdRtfp8T52KCNEvQfaQRbMc1s
+ 7xBcuyaHZp371OfoieJEpzgYkR0ZgCI5GNBBjmXMEvZT5YcClmv/X80/oLIokKWT
+ ahWWCR4DULcp+U1czGshTbCTSosxDbJSxeiqVhaBKnmzPBtc4jXuejjCfZ/cW63A
+ 87436RAvjG0udEJ+1t5U5y+N8oPQC61crI39fcviBBGvdg82Y4mmCY+yxw==
+ </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>
+ MIIDJzCCAg+gAwIBAgIUTbwjzHy1V/QauduA1UWBe4i3xUwwDQYJKoZIhvcNAQEL
+ BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMFoX
+ DTM1MDcyMjExMDkwMFowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
+ BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIEvn9RF5E6Oae2UsQZx/wyV4taa
+ 1LyvNNew/XYBVzULQqETqNxCMDyKVhj74s6b6Kl0rim9y4ACSOTU/rGtYbg+WnFP
+ b6iRQnm0+hH/PJxlulPmp+ExqO+LUblY8+5/iohek7ybhpv5ysebuZbWlEJRutKK
+ AX5N4wLKNKjwXI9B2iZ9IBNfqPrsNLFs7cr3/C2le318BbKK2x37eGSqx/1VgHt6
+ JqCzZty6Y2EXRiVqktNOnPQKTrU6ycxmAhydZKVVpcOQ7MxlzbawV6Lq8xg3a1yP
+ DS533vVEAWhatvqvwk6GPhfZpF62r4uFe121gV+fMWPU2U3Kmz5730ZDgQIDAQAB
+ o2UwYzAdBgNVHQ4EFgQUvBymfqNxuuhIloDW66n/XjoR8ZIwQgYDVR0RBDswOYIP
+ c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
+ YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlGqFXhgYDq2lmraBfGT7hXai/+kX
+ UUnYoAx6rn0g4HXuRGLN5sdQdyjUDenHZBdUkB7iiUTKjYDIaDfFCqf7BhyTZVVp
+ AufFQSZkGobPNF7ryr13Nz1fxYChjg85MSfdLrHy5KzDZHGkbdK6OqJK1GQQmjg7
+ Etkz0PrgplwJvWoY1fwQOT2vZLYN1ZPFbxM40Q9p6cJ3TQze8FCaSeCu1gIcHlZD
+ /v833iBKd3o2FdR4hoajUlNy5qida3w+5tgQjCkIg5Uv34TZekf9KpbJeo9aC7rs
+ Js7zvcVri+nme42f+NejEW+w6qOYYYZVUT09NhIEKgqUrBJuF7KVi1ELlw==
+ </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>
+ MIIDKDCCAhCgAwIBAgIVAI7EL52ouKYn3I0Z+dRy2QFDx5jFMA0GCSqGSIb3DQEB
+ CwUAMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azAeFw0xNTA3MjIxMTA5MDFa
+ Fw0zNTA3MjIxMTA5MDFaMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLucDSwLRP0IcDwnEEKCZm0SKtY
+ aOtwm6vsDDh00gJb9kYVEAY3jB0tQ1TJelP1Um+IhNVpqR6vj0wNy6TQmzC7CThZ
+ T4Ivzj5/EpVXG1J8Cee5ZHXIgy8wd9JlSsJdKEXajnvLw0y979rSfFrypH6bt9D+
+ M1gZcqJJ49W/nmVFO6KSMKg1aMLFXEW9gs0/FJ7KKHZc0zApbMjf7JPKcJLqcWkx
+ tsS1knn3IXVgCqKa8C3abRXDFm5HCjXl5W3GRUsjMtfhj0SbR2zXObW4TfCGzwjP
+ PsCB+tcJfC6ATPo6KW365qihXUdXLkwD6kDik0P7ROpIIQk/p2yPJW2gx4ECAwEA
+ AaNlMGMwHQYDVR0OBBYEFKDiJVWfMtW+Wm3pSXbjxc0cpZBtMEIGA1UdEQQ7MDmC
+ D3NoaWIuYnNkYy5hYy51a4YmaHR0cHM6Ly9zaGliLmJzZGMuYWMudWsvaWRwL3No
+ aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEdI61HWJApulHacwluKOoreXtFZ
+ r3q7sqANksGdQGMpMqsI++fR8CHFcYj1LaiHM+R/paLIbZNVRBle5RdEaVGd7kqM
+ Y1LudYKFAF+Og9KEoPhLw4Z+uaQywMa5kcX3SA1hxVppAF4/Xgy5HX8BEifUAXcr
+ 4pm7fJp/FFyAvhlqHxZBI/etUPJ34rhbg6zxP/RPgrvxh+WnQo7sFaiy14gd2U43
+ Oybgnnk8z9+xVZrJPihLdrcLVLfqW88KZOWKk6f7UuRMLiuA/PI2Fm15KOjxldT8
+ dMcsID2b60k2kzoN1u1QOsCwZv0CkOcRz+sjVix5YBsiAdkDOn3vXkSk4KE=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -50,44 +96,91 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDJzCCAg+gAwIBAgIUN8y30toYLjtWupKH7DVDzwSSKuswDQYJKoZIhvcNAQEL
+ BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMVoX
+ DTM1MDcyMjExMDkwMVowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
+ BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7cEKQ9U09f5UJt9PYlw4z+Cw/fuy
+ 1N+4xPkfibEj/EWCUMJ/dyqtkhmmsId8GdUzPJOXgE37oMJP4BYjKGJHcGz9Q2DP
+ EgSDPBVBexlQKyuIjVllaB0yCGPDekKL5PWXFbp6OVEPN+YNVEyJE6wQcqFK92Ml
+ QnywsKIEC6vsAeZzBRxYnUIioL6gMKgYynuKBfPo+uylPsakFQoKF5aiqH/fdIHL
+ MO17BiDQGfWyslSgDbL1YQqONvw/NtVjpLjWjnYw3SdmyvOM8CnDZFWwDOi3MWAR
+ dSrtdPVICwRIFUk0/t30pCoebJmXMEtiG3QmeC6dBRchcr/4mkX4QQaUpQIDAQAB
+ o2UwYzAdBgNVHQ4EFgQUVLuuZKNnpMw5MMO4MsJzkeDW9SQwQgYDVR0RBDswOYIP
+ c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
+ YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAV5Z154bfv7fMTvjs+mIXf62g/znr
+ JpCulJmY0ckkYsm6qpAp7jRaW3g8ZIqtwcrPWbflLdlJduFeXt3iHQzNKelCuTVQ
+ zaT1uku34qLw5n8dlLSJCAYTJ3k8DP9paZAHWQutdRtfp8T52KCNEvQfaQRbMc1s
+ 7xBcuyaHZp371OfoieJEpzgYkR0ZgCI5GNBBjmXMEvZT5YcClmv/X80/oLIokKWT
+ ahWWCR4DULcp+U1czGshTbCTSosxDbJSxeiqVhaBKnmzPBtc4jXuejjCfZ/cW63A
+ 87436RAvjG0udEJ+1t5U5y+N8oPQC61crI39fcviBBGvdg82Y4mmCY+yxw==
+ </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>
- MIIDKDCCAhCgAwIBAgIVAPqc3rb7Due/A8SDksahSIV81mhLMA0GCSqGSIb3DQEB
- BQUAMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azAeFw0xMjA3MTAxNTUyMzVa
- Fw0zMjA3MTAxNTUyMzVaMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVOink2gWh8mkWeSVHq2r9YG1Tm
- MqJO8YLKq6iYGPLHgqBknI2RnbNOP2BbvRz6HpXOBhSADK6ihqs2oPWPgvfQSaaQ
- k0SPcObBaxoQf1obLqrckTQlsUMZpiYXbFqNQvxzvieRotPA+UDJypvpo7eoWjfR
- R7xgPDl+MyEGr0j+eg817H2ODl98TeP7wNkbct6ROxi/SRTv2G31lslOqpV7k0EB
- vWZhDTqdJ5QfOABXUIDJsiS0HGmQmF6r22X/eSpYgCPXoYbXJUzM0Kmxg5ak6MUt
- Cbf1l9RpY5z5CIOBjiImDI0JsJQFqDCIgEbHFJwxHayM04p+rgZOuaCSBD0CAwEA
- AaNlMGMwQgYDVR0RBDswOYIPc2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIu
- YnNkYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdGAiYrBrJg3eOSOb
- kV7aCm4GFm4wDQYJKoZIhvcNAQEFBQADggEBAAFPVigjx7LAJET1QnJQukSSJK7W
- 0EpEzBtVEA4OG7bEWcSc1vn4Jxzsceg+Q7QLPahg3isvR5NGGJ2sBC/KaOXZqI9e
- 6CkuUhu2bqJnsY7KvkTMt4H44WUzTx2z5YPhHWkIGo0F39MH7pKk3OMLe71BbLG4
- WFdm8pU2h+LDxCbGWnHqsuIr2C5hqvKKs77Pti7otupF2+6+2XOlE1bk3DJMGLG6
- 5i3cPVfbVjl/Ztn02yBxrgoVTKLqChuTcez6Af5eVptOkfnWcn9J3YedTv3P5CpT
- ymcVURb4Pl30AjdHCCwyQvSiuYZfdDSOolEVcnTZVvKK1wft5xLTTAb2R4M=
+ MIIDJzCCAg+gAwIBAgIUTbwjzHy1V/QauduA1UWBe4i3xUwwDQYJKoZIhvcNAQEL
+ BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMFoX
+ DTM1MDcyMjExMDkwMFowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
+ BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIEvn9RF5E6Oae2UsQZx/wyV4taa
+ 1LyvNNew/XYBVzULQqETqNxCMDyKVhj74s6b6Kl0rim9y4ACSOTU/rGtYbg+WnFP
+ b6iRQnm0+hH/PJxlulPmp+ExqO+LUblY8+5/iohek7ybhpv5ysebuZbWlEJRutKK
+ AX5N4wLKNKjwXI9B2iZ9IBNfqPrsNLFs7cr3/C2le318BbKK2x37eGSqx/1VgHt6
+ JqCzZty6Y2EXRiVqktNOnPQKTrU6ycxmAhydZKVVpcOQ7MxlzbawV6Lq8xg3a1yP
+ DS533vVEAWhatvqvwk6GPhfZpF62r4uFe121gV+fMWPU2U3Kmz5730ZDgQIDAQAB
+ o2UwYzAdBgNVHQ4EFgQUvBymfqNxuuhIloDW66n/XjoR8ZIwQgYDVR0RBDswOYIP
+ c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
+ YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlGqFXhgYDq2lmraBfGT7hXai/+kX
+ UUnYoAx6rn0g4HXuRGLN5sdQdyjUDenHZBdUkB7iiUTKjYDIaDfFCqf7BhyTZVVp
+ AufFQSZkGobPNF7ryr13Nz1fxYChjg85MSfdLrHy5KzDZHGkbdK6OqJK1GQQmjg7
+ Etkz0PrgplwJvWoY1fwQOT2vZLYN1ZPFbxM40Q9p6cJ3TQze8FCaSeCu1gIcHlZD
+ /v833iBKd3o2FdR4hoajUlNy5qida3w+5tgQjCkIg5Uv34TZekf9KpbJeo9aC7rs
+ Js7zvcVri+nme42f+NejEW+w6qOYYYZVUT09NhIEKgqUrBJuF7KVi1ELlw==
+ </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>
+ MIIDKDCCAhCgAwIBAgIVAI7EL52ouKYn3I0Z+dRy2QFDx5jFMA0GCSqGSIb3DQEB
+ CwUAMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azAeFw0xNTA3MjIxMTA5MDFa
+ Fw0zNTA3MjIxMTA5MDFaMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLucDSwLRP0IcDwnEEKCZm0SKtY
+ aOtwm6vsDDh00gJb9kYVEAY3jB0tQ1TJelP1Um+IhNVpqR6vj0wNy6TQmzC7CThZ
+ T4Ivzj5/EpVXG1J8Cee5ZHXIgy8wd9JlSsJdKEXajnvLw0y979rSfFrypH6bt9D+
+ M1gZcqJJ49W/nmVFO6KSMKg1aMLFXEW9gs0/FJ7KKHZc0zApbMjf7JPKcJLqcWkx
+ tsS1knn3IXVgCqKa8C3abRXDFm5HCjXl5W3GRUsjMtfhj0SbR2zXObW4TfCGzwjP
+ PsCB+tcJfC6ATPo6KW365qihXUdXLkwD6kDik0P7ROpIIQk/p2yPJW2gx4ECAwEA
+ AaNlMGMwHQYDVR0OBBYEFKDiJVWfMtW+Wm3pSXbjxc0cpZBtMEIGA1UdEQQ7MDmC
+ D3NoaWIuYnNkYy5hYy51a4YmaHR0cHM6Ly9zaGliLmJzZGMuYWMudWsvaWRwL3No
+ aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEdI61HWJApulHacwluKOoreXtFZ
+ r3q7sqANksGdQGMpMqsI++fR8CHFcYj1LaiHM+R/paLIbZNVRBle5RdEaVGd7kqM
+ Y1LudYKFAF+Og9KEoPhLw4Z+uaQywMa5kcX3SA1hxVppAF4/Xgy5HX8BEifUAXcr
+ 4pm7fJp/FFyAvhlqHxZBI/etUPJ34rhbg6zxP/RPgrvxh+WnQo7sFaiy14gd2U43
+ Oybgnnk8z9+xVZrJPihLdrcLVLfqW88KZOWKk6f7UuRMLiuA/PI2Fm15KOjxldT8
+ dMcsID2b60k2kzoN1u1QOsCwZv0CkOcRz+sjVix5YBsiAdkDOn3vXkSk4KE=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bsdc.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">Burton and South Derbyshire College</OrganizationName>
<OrganizationDisplayName xml:lang="en">Burton and South Derbyshire College</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bsdc.ac.uk/</OrganizationURL>
+ <OrganizationURL xml:lang="en">https://www.bsdc.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Helpdesk</GivenName>
diff --git a/swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml
deleted file mode 100644
index 6d9abcf2..00000000
--- a/swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.dur.ac.uk:444/idp/shibboleth">
- <!--
- This is a Shibboleth test IdP for the University of Durham.
- -->
- <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">dur.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Durham test (Do not use)</mdui:DisplayName>
- <mdui:Logo height="101" width="90">https://shib.dur.ac.uk:444/idp/images/du90x101.png</mdui:Logo>
- <mdui:Logo height="16" width="16">https://shib.dur.ac.uk:444/idp/images/du16x16.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
- HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
- BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
- NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
- BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
- BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
- KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
- 8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
- Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
- 3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
- oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
- A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
- ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
- gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
- 76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
- yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
- zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
- drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
- 0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
- CDgIrJGVkQXCNg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk:444/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk:444/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">dur.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
- HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
- BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
- NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
- BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
- BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
- KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
- 8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
- Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
- 3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
- oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
- A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
- ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
- gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
- 76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
- yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
- zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
- drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
- 0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
- CDgIrJGVkQXCNg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Durham</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Durham test (Do not use)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.dur.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Michael</GivenName>
- <SurName>Young</SurName>
- <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Young</SurName>
- <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ba2a0843..00000000
--- a/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.slcs.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for MyScience.co Limited, trading as National Science Learning Centre.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-05T16:28:00Z">
- <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">slcs.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">National Science Learning Centre</mdui:DisplayName>
- <mdui:Description xml:lang="en">Science Learning Centres are a national network for professional development in science teaching.</mdui:Description>
- <mdui:Logo height="72" width="200">https://shib.slcs.ac.uk/images/nslc.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEbDCCA1SgAwIBAgIRAK0yQqUXeWtcLxUv7qHLOWMwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMD0xITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPc2hpYi5zbGNz
- LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwmGmPdTY0lm
- gJv1BOz0VKGDHxYARn6CjWcAiYwSCRdKPcvuC+9u+WE/Ix99pohRmUBPMvMrV7cQ
- 3tay1PVfzRKaQHuaBfebcdKvTbYit+9qkPF0G2bpEAGExDILj+iX4hz2aDXWALsZ
- h7KgAnqDmFtEBTQ7zSSaJ0RC/OHxSfnPcKq+5u9q2khSSlZ2qm9TALHBqzHFZ5Fc
- CqiwDlpaTHUsq+na51qgzMTlFcRUdhuWqswjHwMCXfy+LXrKuB2Tqx2GJGhyxKj0
- qOEcS2Y0sCcbFxWu2YMWBLALrMbWrlxEYQx+rUhc4vaSUP3bdn9WeGSDDmvivc0G
- EH0WGNlHHQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFF5kyhGCi1vHv58VqH8E0F2lyFtzMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
- MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
- bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
- cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
- cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9zaGliLnNsY3MuYWMudWswDQYJ
- KoZIhvcNAQEFBQADggEBAJNfGU4saCObDfVoX5gl/czSR7tT7d/SCn/eC1SrGrfq
- JQGYqWjJUd99BXN5E6ZKWyrYxQmoiciKNDLznkP5JmxKKASZe2J5gTzLX2KiPx43
- b3Bh0oqr3h/aLs0ZPoODUoMYoNDl1Pa83zR9g7sfWD+xmrKWUTLRLtZkagMl17wh
- fofDtEw68wcgdZRE5Nal0fh0lB2W0Ot9fuWEHHIsw1ofedKSyQBmRdB+ZXmaBzeb
- FUt9W2huCi7fG7A5O4VNeh4rrdcQ4EOfg/K4pTSayAphryV7DfnH3L7BpreKFQwX
- 7nwQQNJNDTLtIPdwewp8lXQLC+3IMUUqhQCTVQ9TVrs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.slcs.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.slcs.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">slcs.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEbDCCA1SgAwIBAgIRAK0yQqUXeWtcLxUv7qHLOWMwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMD0xITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPc2hpYi5zbGNz
- LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwmGmPdTY0lm
- gJv1BOz0VKGDHxYARn6CjWcAiYwSCRdKPcvuC+9u+WE/Ix99pohRmUBPMvMrV7cQ
- 3tay1PVfzRKaQHuaBfebcdKvTbYit+9qkPF0G2bpEAGExDILj+iX4hz2aDXWALsZ
- h7KgAnqDmFtEBTQ7zSSaJ0RC/OHxSfnPcKq+5u9q2khSSlZ2qm9TALHBqzHFZ5Fc
- CqiwDlpaTHUsq+na51qgzMTlFcRUdhuWqswjHwMCXfy+LXrKuB2Tqx2GJGhyxKj0
- qOEcS2Y0sCcbFxWu2YMWBLALrMbWrlxEYQx+rUhc4vaSUP3bdn9WeGSDDmvivc0G
- EH0WGNlHHQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFF5kyhGCi1vHv58VqH8E0F2lyFtzMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
- MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
- bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
- cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
- cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9zaGliLnNsY3MuYWMudWswDQYJ
- KoZIhvcNAQEFBQADggEBAJNfGU4saCObDfVoX5gl/czSR7tT7d/SCn/eC1SrGrfq
- JQGYqWjJUd99BXN5E6ZKWyrYxQmoiciKNDLznkP5JmxKKASZe2J5gTzLX2KiPx43
- b3Bh0oqr3h/aLs0ZPoODUoMYoNDl1Pa83zR9g7sfWD+xmrKWUTLRLtZkagMl17wh
- fofDtEw68wcgdZRE5Nal0fh0lB2W0Ot9fuWEHHIsw1ofedKSyQBmRdB+ZXmaBzeb
- FUt9W2huCi7fG7A5O4VNeh4rrdcQ4EOfg/K4pTSayAphryV7DfnH3L7BpreKFQwX
- 7nwQQNJNDTLtIPdwewp8lXQLC+3IMUUqhQCTVQ9TVrs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.slcs.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">MyScience.co Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">National Science Learning Centre</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://www.sciencelearningcentres.org.uk/national/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>SLCS support</GivenName>
- <EmailAddress>mailto:support@slcs.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>SLCS support</GivenName>
- <EmailAddress>mailto:support@slcs.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
index af5b6817..528fcfaa 100644
--- a/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://masaq.oucs.ox.ac.uk/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.theiet.org/shibboleth">
<!--
- This is a Shibboleth SP for University of Oxford.
+ This is a Shibboleth SP for The Institution of Engineering and Technology.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,35 +20,35 @@
<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="2013-10-10T10:47:49Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-30T09:54:24Z">
<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://masaq.oucs.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.theiet.org/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDADCCAeigAwIBAgIJALjsZAqK6FUqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE21hc2FxLm91Y3Mub3guYWMudWswHhcNMTMwOTIwMTExNjU2WhcNMjMwOTE4
- MTExNjU2WjAeMRwwGgYDVQQDExNtYXNhcS5vdWNzLm94LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9ULFDudvq0bdTHSkYluO2b262utN9p1x
- u7YY0T2GOemIWmw2SOngyFEh67o0VSWWcaWjnRMmzyLIXC+XK7ypriibmhZBVRHK
- xAIgVhH8wbK3CEMP5+F8WQcdDwwGxnk6rhn0YmPJ8GFq6TNo+FnYwry3Ojgs/sUr
- guGE27x+GdRcWmsTbQj5mlxoffaB93k/kyzAC2d9Gitq5fvypQMiakFVafCdksXn
- PnYp5/jYKQGo/zcFvdO+SLUDd4u1cJvPQxIgZp8qkQzjU5p6u8eXC2+05pIQJBbg
- vH/Al4iW258o4V873HyXehm5Y715gWoNR1Ewmyp/h2g6OZH7PfQnGQIDAQABo0Ew
- PzAeBgNVHREEFzAVghNtYXNhcS5vdWNzLm94LmFjLnVrMB0GA1UdDgQWBBTGZXOE
- j1iBntwwxtXItqm0nW1J+DANBgkqhkiG9w0BAQUFAAOCAQEAdXM8ECCvAtZp/Jr2
- zHKMycrGPZbt6y6Nk/+fMzRgAyP80WQV/Nci5jwwYan6he0TtjEVUP3zNWuElAfA
- sgIvEY4VTrvJ2ARcw+bfp/BeXvzMAclzBzZSlcfHqXenXyw5N/PBtfkgyBUOORVA
- /9aPp3RuJXVca95Y6JaHmGBYeZgYVFQkAWiz9PgRLKLFkcw9y7VwlMsZkylnk79F
- 2BAnVXYem+hQf+NT2FvT8TrUTef/Kwav9nPgM1Nat4v06xkugbPo8pd+0g22Wkzz
- LZxdIwRUrC1nm1O2BiRECpUQO5gPwpupPhMET0F9cEaFH68MT9DLJtVI1N1P1ZIO
- DkSyzg==
+ MIIDITCCAgmgAwIBAgIJAN2I4zf0p8hfMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+ BAMTHjYzMzkzMy13c2VpMS5sb24uaW50ZW5zaXZlLmludDAeFw0xNTA3MjMwNzQy
+ MjdaFw0yNTA3MjAwNzQyMjdaMCkxJzAlBgNVBAMTHjYzMzkzMy13c2VpMS5sb24u
+ aW50ZW5zaXZlLmludDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJgw
+ uzjl7ojagD+weX2xP9tmanTdXC1S2Z+/RmlJFgTH3e8vuZGefGA/CiG0NZfhGeIA
+ IvLG1mNgq1XUk+i2zj0bpo1lf9ZD4+rM1WEDP9Is3o+CId4rlqlLEV1+wiWv+lKi
+ R9sYhub+SBNCsWbndUtgL8B9Uzi1wc4zQ7lvbV0MoCJPUGtdtK5eee+9VMD4MPOL
+ szTxCJg5vsU+bolurr0NB4lETrd93JVtp3kLRkygC1xzuBxreOUn5DTOVww0Sz2I
+ y1WRU9VK0BjbIJRnznHoLxQWbj7CgKuygI4vpOlt0HBzSC/6BB/3dUnHT9oxlZ3z
+ d3LY5Cy3k9tI9njU6sUCAwEAAaNMMEowKQYDVR0RBCIwIIIeNjMzOTMzLXdzZWkx
+ Lmxvbi5pbnRlbnNpdmUuaW50MB0GA1UdDgQWBBTweJWrTk3cVYECwy8wA49GfYVs
+ QTANBgkqhkiG9w0BAQUFAAOCAQEAltn6UF4taVBOa+wOMu7qRIw80TtFzaZLud15
+ f7OggdEiN7eXRnuvgPIegCPcPQstjTDQxG2yY+tStKlzwqMJLUbi0jYieAAQhWL1
+ xn+t/O2X89w7mgMQftVcgZO4qo3FA0qFhmSYRcqUQnBWWrN9+Upjv75qmZ9Y4f4J
+ m91hsYbVGg5wjb25Z+NMfaq9j4E+cta0w10ipCiUYjp+3c2BCTY8RfmvNjleBw2C
+ LS9D/jGafuWQZ6Wu2E7/tgGPdh3ncDsFwXEw4BBx3NVu8UxPuGBwBSzjl4JetuOM
+ EiKAsWccGKR+zkAE1ZQv9Kf0t1dxdsNPK9aoLqY1dO3dILZdow==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -62,29 +62,31 @@
<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://masaq.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.theiet.org/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.theiet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Test Shibboleth SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk</OrganizationURL>
+ <OrganizationName xml:lang="en">The Institution of Engineering and Technology</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">The Institution of Engineering and Technology</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.theiet.org/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
+ <GivenName>Ross</GivenName>
+ <SurName>London</SurName>
+ <EmailAddress>mailto:RLondon@theiet.org</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
+ <GivenName>Ravi</GivenName>
+ <SurName>Racharla</SurName>
+ <EmailAddress>mailto:ravi.racharla@northgate-is.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
deleted file mode 100644
index b58d05a1..00000000
--- a/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2sp.ntu.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2.3.1 SP for Nottingham Trent University
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
- DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
- vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
- ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
- 6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
- VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
- YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
- A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
- OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
- d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
- yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
- os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
- x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
- 4lcfxOKtZ+Rx/ai+73mSLQ==
- </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>
- MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
- DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
- vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
- ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
- 6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
- VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
- YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
- A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
- OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
- d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
- yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
- os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
- x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
- 4lcfxOKtZ+Rx/ai+73mSLQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Nottingham Trent University: Service Provider</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Richard</GivenName>
- <SurName>Cross</SurName>
- <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Lee</GivenName>
- <SurName>Hallam</SurName>
- <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
index 9ce75d1e..fdf95478 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
@@ -27,48 +27,6 @@
<ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
-ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
-CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
-i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
-Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
-nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
-FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
-/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
-eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
-8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
-YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
-2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
-0k8KqBoqgDYGCrwSLQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
@@ -128,48 +86,6 @@ JpA2gfQhkeFqqwJRdF6UeVYRdtar
<ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
-ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
-CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
-i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
-Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
-nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
-FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
-/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
-eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
-8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
-YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
-2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
-0k8KqBoqgDYGCrwSLQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
index 3b855761..5f7a3d57 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
@@ -27,45 +27,6 @@
<ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
-MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
-HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
-0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
-01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
-aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
-xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
-Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
-Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
-z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
-/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
-tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
-LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
-tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNTA3MjAw
@@ -123,45 +84,6 @@ HQ==
<ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
-MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
-HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
-0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
-01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
-aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
-xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
-Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
-Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
-z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
-/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
-tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
-LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
-tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNTA3MjAw
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
index 0beafd08..54ee9881 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
@@ -27,48 +27,6 @@
<ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
@@ -129,48 +87,6 @@ wDkP23Ru
<ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
diff --git a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml
deleted file mode 100644
index cdc7920c..00000000
--- a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.amdigital.co.uk/shibboleth-sp">
- <!--
- This is a Shibboleth SP for Adam Matthew Digital Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.amdigital.co.uk/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://shibboleth.amdigital.co.uk/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://shibboleth.amdigital.co.uk/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://shibboleth.amdigital.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPe6QSEcGRk8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGnNoaWJib2xldGguYW1kaWdpdGFsLmNvLnVrMB4XDTExMDMwMzEyMDIxMloX
- DTE2MDMwMTEyMDIxMlowJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5hbWRpZ2l0YWwu
- Y28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4pvlbjpzFVWoX
- CwMEQs/lKAB5fRNdIbeCLqumBjdVeh/rNVWHsLdOltDuaLlfRT+OXYI3962tezKO
- gPJb0WhuUEoT5My92nyceHU1tUtZTtRxrXh7NbNxNasmBpXxhWxdxPkQpvt7tza8
- bcoXX7Y1V8AFdoOoOA+CE05mimoqPf+76JuW6PTpF083fPMyf34EyYwWiVcGNfTJ
- IaNdAd23Q3hxpm2P3WhFI3y/jWK74jziP0a9r6Wp/HRIvcyFfLlaqlFaOvr7v0SR
- Gk6kuMF2sXrfj9OMd7m6+5v9CRdiX56nYYHdD1jhf/5zsNXMDvMTY1fNtosEIomm
- BaGnnwIHAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJib2xldGguYW1kaWdpdGFs
- LmNvLnVrMB0GA1UdDgQWBBRSfPmrYGKQQdVWbnmrysdcv1KtpzANBgkqhkiG9w0B
- AQUFAAOCAQEAYalolZpZEQk9zTCR503YHoxf901rRBqF39GBt59Gw/pDKhop+ktm
- i0aYmIJP60NATkKYluvUtQBKSb11FaSil6QZuzcz5q1aVPfyW1jMgK2C3R0f43mD
- pl8gfZGBXF6Sm96KGuXrT89+bWuzndflDLCaHltTmwg7UFM0uGYhfO49TVENLU9O
- 9O3zn5BmDgPO6E7zlnLLkLd3HYV5mf8JmQmupCsuHeL8Ip1twZbbuixEVrXSOEV/
- iw65O0mJIhVzUnl2rQ+/7GiB0A3wZpvGu8EVEgjJGT6wye3l8D8lN11NNGCs76CC
- lM5VbBovDN5R8HI4KUo2eMInLDUUf5p0oQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Adam Matthew Digital Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Adam Matthew Digital Limited</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.amdigital.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Jonathan</GivenName>
- <SurName>Mansfield</SurName>
- <EmailAddress>mailto:support@amdigital.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Glyn</GivenName>
- <SurName>Porritt</SurName>
- <EmailAddress>mailto:glyn@amdigital.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
index 55198510..e610966b 100644
--- a/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
@@ -85,11 +85,6 @@
<SurName>Wimalasiri</SurName>
<EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</EmailAddress>
</ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Newman</SurName>
- <EmailAddress>mailto:chris.newman@clickview.co.uk</EmailAddress>
- </ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Sahan</GivenName>
<SurName>Wimalasiri</SurName>
diff --git a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
index 24e33944..033354de 100644
--- a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
+++ b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
@@ -1,12 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
<!--
- This is a Shibboleth SP owned by EBSCO Publishing, Inc.
+ This is a Shibboleth SP for EBSCO Publishing, Inc.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-06-12T13:07:52Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <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://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
<idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
@@ -48,6 +66,15 @@
</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>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,13 +101,13 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="5"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">EBSCO Publishing, Inc</OrganizationName>
diff --git a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
index 58442e09..0c060cce 100644
--- a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
@@ -47,40 +47,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwjCCA6qgAwIBAgIQWxPdS8jCDo8CQ9VCPed5HzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDcyNjAwMDAwMFoXDTE1MDcyNjIzNTk1OVowgZMxCzAJBgNV
- BAYTAkdCMRgwFgYDVQQIEw9XZXN0IExhbmNhc2hpcmUxETAPBgNVBAcTCE9ybXNr
- aXJrMR0wGwYDVQQKExRFZGdlIEhpbGwgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQg
- U2VydmljZXMxIjAgBgNVBAMTGXNoaWJib2xldGguZWRnZWhpbGwuYWMudWswggEi
- MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCthQGEpUJ/yS9OfmAkx6OZg6Wh
- FzM1cXm63rNtc2uZkd+ozCw3WtQKKyDRBr8Q7XbJr50fwKptdNJ3T0oWTIWLy38U
- 69KC8EwSAVy63DSWOhR4Quk+WzIc84XSfJWzQo3uFfJxx0N4K19ppIUP66oA8rII
- 9HsSSFfSDKkIARrCu+hvYv1qhIVsFRqF8REjrq5uh/Ono8MjMxshAPc6bGc5gZdu
- d5NkvWy0vWUo472pkKBYnLShqI6+7gR5pIpoisasohleI6cYIW5SnSHv4OPILRRF
- KLsjc5VKRyrcp51ZR61PD2ugifyHtY3t1fQMKzE8Xu10uegPvh8dP1ReHeDrAgMB
- AAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
- HQ4EFgQUa57IILbkKZWeXJJRgQDqoRdmZhcwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
- EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
- MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
- Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
- CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
- LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYD
- VR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azANBgkqhkiG9w0BAQUF
- AAOCAQEAJ1aYSHILz1s8FOUJ8CyMaY6SJ51sIDsUR/CzifMmTaYi/tWoTVO+GQWg
- yZJnChdXnQPRXs2H24F7HXGERAlLVy52Iu1S3ki7QaAbHz2/RtVcclrhepZAgMAe
- 0MXVBU6ZQmx5GLXr54lmU9eZqttIAJF0Z4yQJUVWsJG/1Y9zhabO2xwqZGAZNvdR
- un+tHnO3jqbRxuhvqKQRWH3hTxOQykP3HN8cMvy5zKhz/7Sc0Mub+1RRMo8aIx/V
- xn4HkrUz5OwdKNj8DIn8uLlo3BCRPqo2J/ar4yAyNFbG0bBj20vNsgM8MxTWQg1o
- NovUGgpJ3goRRkkfWFQ2MkKl4od7aQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -129,40 +95,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwjCCA6qgAwIBAgIQWxPdS8jCDo8CQ9VCPed5HzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDcyNjAwMDAwMFoXDTE1MDcyNjIzNTk1OVowgZMxCzAJBgNV
- BAYTAkdCMRgwFgYDVQQIEw9XZXN0IExhbmNhc2hpcmUxETAPBgNVBAcTCE9ybXNr
- aXJrMR0wGwYDVQQKExRFZGdlIEhpbGwgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQg
- U2VydmljZXMxIjAgBgNVBAMTGXNoaWJib2xldGguZWRnZWhpbGwuYWMudWswggEi
- MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCthQGEpUJ/yS9OfmAkx6OZg6Wh
- FzM1cXm63rNtc2uZkd+ozCw3WtQKKyDRBr8Q7XbJr50fwKptdNJ3T0oWTIWLy38U
- 69KC8EwSAVy63DSWOhR4Quk+WzIc84XSfJWzQo3uFfJxx0N4K19ppIUP66oA8rII
- 9HsSSFfSDKkIARrCu+hvYv1qhIVsFRqF8REjrq5uh/Ono8MjMxshAPc6bGc5gZdu
- d5NkvWy0vWUo472pkKBYnLShqI6+7gR5pIpoisasohleI6cYIW5SnSHv4OPILRRF
- KLsjc5VKRyrcp51ZR61PD2ugifyHtY3t1fQMKzE8Xu10uegPvh8dP1ReHeDrAgMB
- AAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
- HQ4EFgQUa57IILbkKZWeXJJRgQDqoRdmZhcwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
- EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
- MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
- Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
- CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
- LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYD
- VR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azANBgkqhkiG9w0BAQUF
- AAOCAQEAJ1aYSHILz1s8FOUJ8CyMaY6SJ51sIDsUR/CzifMmTaYi/tWoTVO+GQWg
- yZJnChdXnQPRXs2H24F7HXGERAlLVy52Iu1S3ki7QaAbHz2/RtVcclrhepZAgMAe
- 0MXVBU6ZQmx5GLXr54lmU9eZqttIAJF0Z4yQJUVWsJG/1Y9zhabO2xwqZGAZNvdR
- un+tHnO3jqbRxuhvqKQRWH3hTxOQykP3HN8cMvy5zKhz/7Sc0Mub+1RRMo8aIx/V
- xn4HkrUz5OwdKNj8DIn8uLlo3BCRPqo2J/ar4yAyNFbG0bBj20vNsgM8MxTWQg1o
- NovUGgpJ3goRRkkfWFQ2MkKl4od7aQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index a9b8ae7a..00000000
--- a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ens-lyon.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-04-16T15:12:48Z">
- <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">ens-lyon.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">ENS de Lyon</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>
- MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
- </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>
- MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
-f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
-tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
-I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
-p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
-WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
-3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
-Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
-oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
-bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
-y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
-3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
- </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.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ens-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">ens-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>
- MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
- </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>
- MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
-f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
-tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
-I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
-p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
-WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
-3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
-Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
-oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
-bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
-y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
-3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-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">ENS de Lyon</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Hugo Etievant</md:SurName>
- <md:EmailAddress>hugo.etievant@ens-lyon.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Sébastien Mei</md:SurName>
- <md:EmailAddress>Sebastien.Mei@ens-lyon.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
index 1b8a4694..1a443825 100644
--- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
@@ -10,7 +10,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensi-bourges.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
- <mdui:InformationURL xml:lang="fr">http://www.ensi-bourges.fr</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
<mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
@@ -49,7 +49,7 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
<md:Organization>
<md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ensi-bourges.fr</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:SurName>Frédéric AURAMBOUT</md:SurName>
diff --git a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
index bb7049b7..2c97e2b2 100644
--- a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
@@ -4,11 +4,6 @@
This is a Shibboleth IdP for Hillcroft College.
-->
<Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-09T10:50:01Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
@@ -17,7 +12,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hillcroft.ac.uk</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Hillcroft College for Women (Shibboleth)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Hillcroft College</mdui:DisplayName>
<mdui:Logo height="60" width="80">https://shibboleth.hillcroft.ac.uk/logo.jpg</mdui:Logo>
<mdui:Logo height="16" width="16">https://shibboleth.hillcroft.ac.uk/icon.jpg</mdui:Logo>
</mdui:UIInfo>
@@ -97,7 +92,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Hillcroft College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Hillcroft College for Women (Shibboleth)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Hillcroft College</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hillcroft.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
index b6e5906e..c8b73bef 100644
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
@@ -47,8 +47,8 @@ lkm+eYJRFwZraUdycAffqQ==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/SLO"/>
@@ -90,8 +90,8 @@ lkm+eYJRFwZraUdycAffqQ==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at: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>
diff --git a/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml
deleted file mode 100644
index bf17cb33..00000000
--- a/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.iumis.co.uk/shibboleth-sp">
- <!--
- This is a "Test Development System" Shibboleth SP for Uniware Systems Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-03T13:55:20Z"/>
- </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://shibboleth.iumis.co.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAMfd/MptgTr4MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFXUwMTgwNDUudW5pd2FyZS5jby51azAeFw0xMjA0MjAxMjQyMzZaFw0yMjA0
- MTgxMjQyMzZaMCAxHjAcBgNVBAMTFXUwMTgwNDUudW5pd2FyZS5jby51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRgcl652XDcWIJ4rVhsdKbWPRD/
- +pr2WI7G91fpbrbgpmelV8i+YyQ3Xztz/7XbfQDLPyWUvy8cPRUXLBq+xzk65Hj+
- Pe17k8Bo2YzWk3mVj9utSi+4VWZ+qC4l+GnIdQ4t0iDj9X9KcMCJFv541Ih1I0cA
- Dq3YggxcibM13Bne3mYkBr38Zk8zUHFW0oxlwndOtvMaTZkoANuPAxgs2W004VFh
- 9BOv6Ww+w0aU08LkmI5U5Yxojuq/53/1IDXsMPoSdxrICR/AzJ2RbZB8i2ttYvCy
- yU8VungwG8rkGU5T8w91kSQdlmF0TaiiYTqYqVxon0tRulqyKRomPIBIIasCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVdTAxODA0NS51bml3YXJlLmNvLnVrMB0GA1UdDgQW
- BBRXqfbwMPvQYTEZhluO4Cu+YM7d6TANBgkqhkiG9w0BAQUFAAOCAQEAFanur4sV
- TKS5I8TvnCyG57S4W3xJb18W64opxWNxEPHIady60LRlLWIQWaXFLIEL5zq4/VEA
- 0boBhIhSGJO821Z/WRH0bzD4gVjnbR1aJasaxgd1hkwTcJRRorW/f8OPnCNy/FAH
- VaMplq1E0yMFcCozq0ZfWXwlUaZMdvCqweAsSFt3EehdtZpJVoA73fOoPiwoYzSl
- BnmDKI4Ch//jObq+xXoENh7q2w/pbPPCeDOyYi50fV69n0sGVpsCUwkNdm+r+94g
- Nbnt/AF1tYJKe6aqD99bOFtcFksQP75LCDERU5vsluFzm5Qf9YwXFM39YfiP2X/u
- 7ArVRNUmGaMpHw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Uniware Systems Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Uniware Systems Limited: Test Development System</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.uniware.co.uk/upay</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Dean</GivenName>
- <SurName>Cachia</SurName>
- <EmailAddress>mailto:dean.cachia@uniware.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Craig</GivenName>
- <SurName>Moore</SurName>
- <EmailAddress>mailto:Craig.Moore@uniware.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
index 6e7cbcb8..04d42631 100644
--- a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:elab="http://eduserv.org.uk/labels" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mcgill.ca/idp/shibboleth">
+<md:EntityDescriptor xmlns:elab="http://eduserv.org.uk/labels" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mcgill.ca/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-07T00:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
new file mode 100644
index 00000000..15b5f2f1
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mh-hannover.de/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-26T13:58:28Z">
+ <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">mh-hannover.de</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Medizinische Hochschule Hannover</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Hannover Medical School</mdui:DisplayName>
+ <mdui:Description xml:lang="de">MHH-IdP - Produktiv</mdui:Description>
+ <mdui:Description xml:lang="en">MHH IdP - Productive</mdui:Description>
+ <mdui:Logo height="16" width="16">https://shibboleth.mh-hannover.de/idp/images/mhh_icon.ico</mdui:Logo>
+ <mdui:Logo height="60" width="250">https://shibboleth.mh-hannover.de/idp/images/mhh_logo.gif</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIG3zCCBcegAwIBAgIHF5kthgN4JTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
+DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
+LmRlMB4XDTE0MDUxOTA3MTcxMVoXDTE5MDUxODA3MTcxMVowgZYxCzAJBgNVBAYT
+AkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNoc2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEp
+MCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIxDTALBgNV
+BAsTBFpJTXQxIjAgBgNVBAMTGXNoaWJib2xldGgubWgtaGFubm92ZXIuZGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+rVeMLRdkpnizrYdnx6rKFTjK
+fEZXh+1RrTvHsbTt6DLz41QLrrr2aTma8HMyLbJtr62uuKvOqOlat7ikt6x6KT4E
+njHjc4xFgW6LpyJ3hvpq/fMGV2nXRo5pvjFhd6A4bg5TfmECkkTnmu55TllIC1t1
+JzYIgMfR6STiH4qt09Oefd36R70oHWFwOfyS01d0nZ5/6AmMFv7I74Dh0ASeCiQo
+N0B+hocT+WJxXVqukjPIxDygj3EMOwBBjqVCRobLpyacQSc1Akiw71yH9AFj5LNR
+rDjhbom4Vk+Q3TuIXwLI07sl8dDF7W8f2OdI+PHZLu3d44WvxjJiGddbJ1Zlppt/
+8cuK5Alst+AtazTuLCRG78y3TkLYMU4CDdV3ravzy1YL1dUCsXyDamxNIN8digNN
+BzXjkJ7QTOah3nYAiG0yE34tpt2DNbGNZglkPQbhgbM/+lCM76DH95/AC6yyZOLF
+ZbcOgmpAkNVq7htd/Z62KaiUSSzB1KzOxs+IPq3erC6CozyDuXgiIbC/98SnS0cz
+XFKyOzgks3o6o2Mu6D1+lCOHE1kUvABL4sedrkmhERAteR9A1F4yAy+ZD379BtSY
+gA8Sc2vPIBKvx2o/+fhQR4/YNjGOaR+rUiVXzeGHr/u3Yup9ztsKpLM0ksZksYxX
+X6QUMAICu1oDUtKWjwIDAQABo4ICWTCCAlUwOQYDVR0gBDIwMDARBg8rBgEEAYGt
+IYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU+uf4
+1Hbz3g+5aTVL89lFbtU5sv4wHwYDVR0jBBgwFoAUJZuBmmj89gJMu3dfHExoM7Nu
+RmswRgYDVR0RBD8wPYIZc2hpYmJvbGV0aC5taC1oYW5ub3Zlci5kZYEgdGV0emxh
+ZmYuYmVuamFtaW5AbWgtaGFubm92ZXIuZGUwgYgGA1UdHwSBgDB+MD2gO6A5hjdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21oLWhhbm5vdmVy
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHXBggrBgEFBQcBAQSByjCBxzAzBggrBgEF
+BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEcG
+CCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9taC1oYW5ub3Zlci1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAKXYkO2475QAfkK4IZgARuHUesp8kZZHh8YU6YAH
+Wruj5A032fwktpkVt9rhkyPjm/oZr0RdPQKM1BE0se3kCPL4v7MYQDhjvZa66xs3
+iCvJN8NtusArjA9LyjDHUuG+oVKUB+d1HjD3nT8fXGUrw+FYaKoSOPaNBceBBhzr
+DhjST4fPGDO9xwgXbhUcg/+I3E/pLfg8Hj38iFKr9hlpawsJc3A7gruNQp30RyfK
+MN0mlBaZ3pqibwbaDcibWo/Eu8PtwrpYB4XrtBvEgiqWVfA90kNsphQDNYfvaEoZ
+K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mh-hannover.de/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.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">mh-hannover.de</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIG3zCCBcegAwIBAgIHF5kthgN4JTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
+DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
+LmRlMB4XDTE0MDUxOTA3MTcxMVoXDTE5MDUxODA3MTcxMVowgZYxCzAJBgNVBAYT
+AkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNoc2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEp
+MCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIxDTALBgNV
+BAsTBFpJTXQxIjAgBgNVBAMTGXNoaWJib2xldGgubWgtaGFubm92ZXIuZGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+rVeMLRdkpnizrYdnx6rKFTjK
+fEZXh+1RrTvHsbTt6DLz41QLrrr2aTma8HMyLbJtr62uuKvOqOlat7ikt6x6KT4E
+njHjc4xFgW6LpyJ3hvpq/fMGV2nXRo5pvjFhd6A4bg5TfmECkkTnmu55TllIC1t1
+JzYIgMfR6STiH4qt09Oefd36R70oHWFwOfyS01d0nZ5/6AmMFv7I74Dh0ASeCiQo
+N0B+hocT+WJxXVqukjPIxDygj3EMOwBBjqVCRobLpyacQSc1Akiw71yH9AFj5LNR
+rDjhbom4Vk+Q3TuIXwLI07sl8dDF7W8f2OdI+PHZLu3d44WvxjJiGddbJ1Zlppt/
+8cuK5Alst+AtazTuLCRG78y3TkLYMU4CDdV3ravzy1YL1dUCsXyDamxNIN8digNN
+BzXjkJ7QTOah3nYAiG0yE34tpt2DNbGNZglkPQbhgbM/+lCM76DH95/AC6yyZOLF
+ZbcOgmpAkNVq7htd/Z62KaiUSSzB1KzOxs+IPq3erC6CozyDuXgiIbC/98SnS0cz
+XFKyOzgks3o6o2Mu6D1+lCOHE1kUvABL4sedrkmhERAteR9A1F4yAy+ZD379BtSY
+gA8Sc2vPIBKvx2o/+fhQR4/YNjGOaR+rUiVXzeGHr/u3Yup9ztsKpLM0ksZksYxX
+X6QUMAICu1oDUtKWjwIDAQABo4ICWTCCAlUwOQYDVR0gBDIwMDARBg8rBgEEAYGt
+IYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU+uf4
+1Hbz3g+5aTVL89lFbtU5sv4wHwYDVR0jBBgwFoAUJZuBmmj89gJMu3dfHExoM7Nu
+RmswRgYDVR0RBD8wPYIZc2hpYmJvbGV0aC5taC1oYW5ub3Zlci5kZYEgdGV0emxh
+ZmYuYmVuamFtaW5AbWgtaGFubm92ZXIuZGUwgYgGA1UdHwSBgDB+MD2gO6A5hjdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21oLWhhbm5vdmVy
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHXBggrBgEFBQcBAQSByjCBxzAzBggrBgEF
+BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEcG
+CCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9taC1oYW5ub3Zlci1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAKXYkO2475QAfkK4IZgARuHUesp8kZZHh8YU6YAH
+Wruj5A032fwktpkVt9rhkyPjm/oZr0RdPQKM1BE0se3kCPL4v7MYQDhjvZa66xs3
+iCvJN8NtusArjA9LyjDHUuG+oVKUB+d1HjD3nT8fXGUrw+FYaKoSOPaNBceBBhzr
+DhjST4fPGDO9xwgXbhUcg/+I3E/pLfg8Hj38iFKr9hlpawsJc3A7gruNQp30RyfK
+MN0mlBaZ3pqibwbaDcibWo/Eu8PtwrpYB4XrtBvEgiqWVfA90kNsphQDNYfvaEoZ
+K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e435</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e435</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Medizinischen Hochschule Hannover</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Hannover Medical School (MHH)</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.mh-hannover.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.mh-hannover.de/index.php?id=2</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Benjamin</md:GivenName>
+ <md:SurName>Tetzlaff</md:SurName>
+ <md:EmailAddress>mailto:Benjamin.Tetzlaff@mh-hannover.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Benjamin</md:GivenName>
+ <md:SurName>Tetzlaff</md:SurName>
+ <md:EmailAddress>mailto:Benjamin.Tetzlaff@mh-hannover.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
index 8d4fbcf8..57a06dbc 100644
--- a/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
@@ -4,11 +4,6 @@
This is a Shibboleth IdP for Neath Port Talbot College.
-->
<Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T09:00:48Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
new file mode 100644
index 00000000..dc7c097a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.simplyvoting.com/shibboleth-sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-18T02:54:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Simply Voting</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Simply Voting - Shibboleth</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.simplyvoting.com/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>*.simplyvoting.com</ds:KeyName>
+ <ds:KeyName>https://shibboleth.simplyvoting.com/shibboleth-sp</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKTCCAhGgAwIBAgIJAPuqVV3UDY+GMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMUEiouc2ltcGx5dm90aW5nLmNvbTAeFw0xMzA1MDIxNDMxNDZaFw0zMzA1MDIx
+NDMxNDZaMB0xGzAZBgNVBAMUEiouc2ltcGx5dm90aW5nLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL1NfC7sSbZ7rIrPRtOX0XyQqopOixyz+Wbt
+absciRx5kGvy6W5B7LCj5szZdkfX0kJNel5DsxDID3jhv5C8nyCzyPzPpK2WaS0g
+bziPtEF63KI90joSar/o/Vi3zDw35zjObedB2YOT40O+lGv1tYPu4grptJvY14Pd
+Qhv/Lm9RZMtR1mVpx/Ll//I3/WPmFqFCX2HsTD4uLY6rNbsPqpzFN4d42RB8Gg4P
+poUA+hs1c/LxnEJ2pcTSPUcJqYMLp+Pvgn6sCofwDjf+DgB9M12LRer5jsW7O8Z8
+zM3tbSjLRv62h0wsT0YaCv/0G+DT2zbuERLROXjCJOavrCiHs+kCAwEAAaNsMGow
+SQYDVR0RBEIwQIISKi5zaW1wbHl2b3RpbmcuY29thipodHRwczovL3d3dy5zaW1w
+bHl2b3RpbmcuY29tL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFKSYgzozQrmdd9lC
+SOa1hZ3NybOGMA0GCSqGSIb3DQEBBQUAA4IBAQCSCHsQUbBjXUBRXcZUQI1gvjlH
+3ny35okVnU9ynT+048dsf/xSm+9IbBXoZw9H1G6/+jC0S5jUSawcr6goHJ8XYVO8
+cFfr5VgrxvV8HR/FtLd3ezEMmJSR20/3AdNC1HyV3Dxgqc59li04Qu5a6zYlUe5t
+hBP2VdDCNba45G0vDUbJXU+XR0F4Xb1XKKoqdI6RSMkzegtbCJoEpi38XqQpQIne
+VDTcV8JaXroxakWgnfj7ARXlchH0tkOP2T8P8WN+SqnuXS9RRQa6GDx4HSoc+lLn
+0obwKRPux6UP6dtWT9gj3nih8ie1XstmErfBW1vLS0+AvfR8cY6KJLkFMZFP
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Artifact"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/SOAP"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Simply Voting</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Simply Voting - Shibboleth</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.simplyvoting.com/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Brian</md:GivenName>
+ <md:SurName>Lack</md:SurName>
+ <md:EmailAddress>mailto:black@simplyvoting.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
new file mode 100644
index 00000000..17235859
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.id.ubc.ca/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T15:30:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</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">ubc.ca</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">The University of British Columbia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The University of British Columbia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ubc.ca</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPzCCAiegAwIBAgIUS6eV0UJWr8nFaqbSe1zg4O1lb7kwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQudWJjLmNhMB4XDTEwMTIwODAx
+NDMyN1oXDTMwMTIwODAxNDMyN1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQu
+dWJjLmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4hL/rsMTupH9
++xNmZgPw+ru6Xonn05D1I4ZOlEh54MNEY+bEuYahSvoAzeNVZXvJjN1f7HQIMmrT
+5USVSrFBnDCGE7hq/RumtlGcl4S5EeBacp2GWKwrWQ9ymKVF8OqNGRnhJDIb3lIh
+DIMx3Zs9AvMOFz+U2TmRLcjZ4lC1bsB5xFlFwJbPrKxCGAIgNVtkNmvhtLpbHN4K
+s4zsTdCIzPu+G3zDNZeZ//hktAiCNF1wDdVZmB7jDLE7JM6dtkAK42ooiXu1hqq1
+bOfd4Eecc754CUeIbk6ElZpli/s8stGe1XPkahZ1LL5JJQbKX1Udokk9FaRg5DNQ
+Mmxwco66HwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoMi5pZC51YmMu
+Y2GGLGh0dHBzOi8vc2hpYmJvbGV0aDIuaWQudWJjLmNhL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBQ+jbb1yi2BZmUxzopC6sV3NmRrODANBgkqhkiG9w0BAQUFAAOC
+AQEAxoy2HSTK/L1ZL7T8joNJ/4j1Exp9fqnViEWItrsyWG/6KufG6s2j0+GXOvy9
+WXpdeIdHzjU3iAUcX5mV7NbKskqLKp0QCmBCLjT3FWjIBFkbdAbf2DvjNSp5XAPt
+kjy3ThVWAFRxbnXu+K3had6WXVtmHzokFA1FtjfTZlNJYlzRrjdMRZAFAswnb6Iw
+LBiArzwbulDn6e1JchJsQjmYeySC3ukrNubxZbprJvgkF3JB/SVGmdd59lR26kSN
+Razfk7UV1M4HAv71TpcdpKM/zApv5/9Glp9lQT+uq2U5TS8njGgEC6Z+ZKDRcOw6
+rmMMp8QfnRo+ehVUPP49SGgN/g==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca: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://shibboleth2.id.ubc.ca/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubc.ca</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPzCCAiegAwIBAgIUS6eV0UJWr8nFaqbSe1zg4O1lb7kwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQudWJjLmNhMB4XDTEwMTIwODAx
+NDMyN1oXDTMwMTIwODAxNDMyN1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQu
+dWJjLmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4hL/rsMTupH9
++xNmZgPw+ru6Xonn05D1I4ZOlEh54MNEY+bEuYahSvoAzeNVZXvJjN1f7HQIMmrT
+5USVSrFBnDCGE7hq/RumtlGcl4S5EeBacp2GWKwrWQ9ymKVF8OqNGRnhJDIb3lIh
+DIMx3Zs9AvMOFz+U2TmRLcjZ4lC1bsB5xFlFwJbPrKxCGAIgNVtkNmvhtLpbHN4K
+s4zsTdCIzPu+G3zDNZeZ//hktAiCNF1wDdVZmB7jDLE7JM6dtkAK42ooiXu1hqq1
+bOfd4Eecc754CUeIbk6ElZpli/s8stGe1XPkahZ1LL5JJQbKX1Udokk9FaRg5DNQ
+Mmxwco66HwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoMi5pZC51YmMu
+Y2GGLGh0dHBzOi8vc2hpYmJvbGV0aDIuaWQudWJjLmNhL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBQ+jbb1yi2BZmUxzopC6sV3NmRrODANBgkqhkiG9w0BAQUFAAOC
+AQEAxoy2HSTK/L1ZL7T8joNJ/4j1Exp9fqnViEWItrsyWG/6KufG6s2j0+GXOvy9
+WXpdeIdHzjU3iAUcX5mV7NbKskqLKp0QCmBCLjT3FWjIBFkbdAbf2DvjNSp5XAPt
+kjy3ThVWAFRxbnXu+K3had6WXVtmHzokFA1FtjfTZlNJYlzRrjdMRZAFAswnb6Iw
+LBiArzwbulDn6e1JchJsQjmYeySC3ukrNubxZbprJvgkF3JB/SVGmdd59lR26kSN
+Razfk7UV1M4HAv71TpcdpKM/zApv5/9Glp9lQT+uq2U5TS8njGgEC6Z+ZKDRcOw6
+rmMMp8QfnRo+ehVUPP49SGgN/g==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca: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">The University of British Columbia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">The University of British Columbia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ubc.ca/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Hari</md:GivenName>
+ <md:SurName>Mailvaganam</md:SurName>
+ <md:EmailAddress>mailto:hari.mailvaganam@ubc.ca</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
index dffc60a9..faf801c7 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
@@ -37,64 +37,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID2TCCA0KgAwIBAgIDEAB/MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
- MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
- ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
- dHkwHhcNMTAwNzA4MTIxNTI5WhcNMTUwNzA3MTIxNTI5WjB2MQswCQYDVQQGEwJV
- SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
- c2VtYW50aWNvMS8wLQYDVQQDEyZzaGliYm9sZXRoMnNwLmJyaWxsLnRlc3Quc2Vt
- YW50aWNvLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG3jtkz
- QfLlLf0PaYfXJvK2wFxKxxQQtUEamoSkj4hqEGtEOJ1fdZDOSexSRWtJ78+uSXor
- RWhi8BSNK3l5Wpj/DkUQeedDDCmK71N0r7zpNLxSsGHC7oS/YKmUnAL7kprZydxx
- QhlkeSkuQnzKY8zGRQHN09aNJB0kMTyWluVvqQeprMhZ8GREsyzDa3JXFrqJsm9h
- MiQU3RqhG1zUh3/ZF/JLhHmJ86lg8qdDVOb9XFRqNm8egtYblzIJD8Xy0TUgba7t
- G0+vKBUmSvTEO2nGyE1ASHNjAX2fjpoWaIphQT0Ljp5sMWyECk62c8VpwiwN4nhb
- C95LYMbNp+pgjfMCAwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
- Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUETYeFc3g
- b6aKmwTSh3GWsLvSaI8wgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJe
- vjmhc6RxMG8xCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcT
- CEJyaWdodG9uMRIwEAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGlj
- byBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAZWJ1
- q4bbc9sJWPIKdCOhMO7ZOXmhmLy2Fz/8zGRRIrzjD4hEFxfBRMnNhuxvcGdv6kNY
- w97NvuBU1SebHu4e5lQFmCzTfri8mnA18Aes7a/XFCDIrv+uzHM3Xjph077RjIes
- BxT33lxvsp2mnJhaeCweHAs12pOLwFLFrd/lN0g=
- </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>
- MIID2TCCA0KgAwIBAgIDEAB/MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
- MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
- ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
- dHkwHhcNMTAwNzA4MTIxNTI5WhcNMTUwNzA3MTIxNTI5WjB2MQswCQYDVQQGEwJV
- SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
- c2VtYW50aWNvMS8wLQYDVQQDEyZzaGliYm9sZXRoMnNwLmJyaWxsLnRlc3Quc2Vt
- YW50aWNvLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG3jtkz
- QfLlLf0PaYfXJvK2wFxKxxQQtUEamoSkj4hqEGtEOJ1fdZDOSexSRWtJ78+uSXor
- RWhi8BSNK3l5Wpj/DkUQeedDDCmK71N0r7zpNLxSsGHC7oS/YKmUnAL7kprZydxx
- QhlkeSkuQnzKY8zGRQHN09aNJB0kMTyWluVvqQeprMhZ8GREsyzDa3JXFrqJsm9h
- MiQU3RqhG1zUh3/ZF/JLhHmJ86lg8qdDVOb9XFRqNm8egtYblzIJD8Xy0TUgba7t
- G0+vKBUmSvTEO2nGyE1ASHNjAX2fjpoWaIphQT0Ljp5sMWyECk62c8VpwiwN4nhb
- C95LYMbNp+pgjfMCAwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
- Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUETYeFc3g
- b6aKmwTSh3GWsLvSaI8wgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJe
- vjmhc6RxMG8xCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcT
- CEJyaWdodG9uMRIwEAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGlj
- byBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAZWJ1
- q4bbc9sJWPIKdCOhMO7ZOXmhmLy2Fz/8zGRRIrzjD4hEFxfBRMnNhuxvcGdv6kNY
- w97NvuBU1SebHu4e5lQFmCzTfri8mnA18Aes7a/XFCDIrv+uzHM3Xjph077RjIes
- BxT33lxvsp2mnJhaeCweHAs12pOLwFLFrd/lN0g=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Redirect"/>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
index 662f6c69..011f85f4 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
@@ -7,60 +7,31 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
- MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
- ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
- dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
- SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
- c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
- GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
- jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
- M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
- DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
- eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
- kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
- R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
- XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
- MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
- EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
- YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
- XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
- E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
- OsSkSoP6HZrPCOXMEAK23C8pxQ==
- </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>
- MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
- MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
- ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
- dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
- SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
- c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
- GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
- jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
- M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
- DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
- eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
- kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
- R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
- XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
- MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
- EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
- YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
- XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
- E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
- OsSkSoP6HZrPCOXMEAK23C8pxQ==
+ MIID1jCCAr6gAwIBAgIJANySKK7sPqq+MA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
+ BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
+ VQQKEwlzZW1hbnRpY28xJTAjBgNVBAMTHHNoaWJib2xldGgyc3AuYnJpbGxvbmxp
+ bmUubmwwHhcNMTUwNzMwMTAzNDI5WhcNMzUwNzI1MTAzNDI5WjBsMQswCQYDVQQG
+ EwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UE
+ ChMJc2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5l
+ Lm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDGthKGzhqlGBQcB
+ u9c2+gPZvoL8QcIfYuz7gyMi1hs4ZQEK/mNwiM2wSbMcG44yvXPcDFSYiKmPtykJ
+ GXRMlSS2Q9O5F5eOnZU40sl4s6Va2oK6SyKA0RnFKwt9svLjHbmMbobQEB4hRdNX
+ Ju9YHL+ql33rAhCdmnDuBmtfPvgu0V6uqb1x5yXShYQdXwD0o6gaBXcxIfDZfCqw
+ ZLeV9XmdRAX5viX2tBp2B6CNT4uPPyhIdVJ6P299xfMwrkKD8+OxzgPn9wYxzq0J
+ vd7WwKFD4Z6waUHTbU2KLVcaCmEZz19K9xofDon1pi+GLUrQawf82mQKGHAhH8Jw
+ +L2tkwIDAQABo3sweTBYBgNVHREEUTBPghxzaGliYm9sZXRoMnNwLmJyaWxsb25s
+ aW5lLm5shi9odHRwczovL3NoaWJib2xldGgyc3AuYnJpbGxvbmxpbmUubmwvc2hp
+ YmJvbGV0aDAdBgNVHQ4EFgQUyOAI3XrlGiIPV0Tofnyk2xSjn1IwDQYJKoZIhvcN
+ AQEFBQADggEBAHyrsIjUUcOSIc5+zVKRH59MFbEjeYMPomEeJmFOxojwDlSbhZ4b
+ 2K2iTcCXlY8rtuuYLrWTLGyhJW+xWGRAJFJwD6F6WHJFEklMYeIAmlXKzCJJKuJn
+ rFzPjibYq2YafhbKn5N8k2QUJKOIhgg4FAWsGXLrcR/7W0LJCg5l2fPyDH/KbRzP
+ OgBYciKv5fbMr+vSM8LYJ9zAKYWsyg3yo6Hrf8RQKsn0ptaSOqJZf0W4mGlH3Ug5
+ GUyHWM3Hk/NPMuV49u+GU/beegr/XVyLUTMj1EyxCPpXr5bShe1sZ73TVQ51b6am
+ uVOG89dvf99DIrLXGx9zxyM6HTWXTmaT/9A=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml
deleted file mode 100644
index df0b1f11..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.now.semcs.net/shibboleth">
- <!--
- This is a "Now Publishers" Shibboleth SP for Semantico Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-19T09:18:39Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDzjCCAzegAwIBAgIDEAB8MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
- MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
- ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
- dHkwHhcNMTMwMzI2MTYzODM1WhcNMTgwMzI1MTYzODM1WjBrMQswCQYDVQQGEwJV
- SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
- c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLm5vdy5zZW1jcy5uZXQw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDspSMFisMgrFl7wbAzbd0d
- 7Mm2vqPTBIx9JUrInCeyptcCL6cYsmkZfD6L34Izf4lXxiFYSeZ9/arLvMrfHw6V
- LHCY1c8Ujlldrf1jWXUlddjV/0jj2bHSpaSkd5Pv2DE+YPbQuWNgEO8LvveJRhsj
- RjdlVb+kp/suP4rV0fE+mBtI0r+fg89NVt0ljGY/fG93jIXZOo+EoRTLQuZdB2p0
- qs/LT/cvicGvD9nlYagx02iRpkRzdEaMd/8K3m9LlUdWAoTE8Pp/gRoDvtjC1b3s
- zNw8bTlb6cnxaNnNkTVhcNVFJU93E+i/tofqdg5SXm1t5XQLBVRn7h+flMhz96dR
- AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
- ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGn2QrAsZmobkkf7vuZiAaeV
- qBTIMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
- CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
- MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
- dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAN99BJdWNmZf2n1X5eDs
- nh+bjmiearQYMxtcGari4biwsLaxboTxWA3RdKAOSiu8mYM/eG9SoafdW5qTv87n
- VvzqCHHHXeXOtizBpnolXO1ggqU5oY8lbIEdGeigfwDCyyKwefLkemv34QpzHWes
- unAmGhPhZk/kNUUgSblqhFu7
- </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>
- MIIDzjCCAzegAwIBAgIDEAB8MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
- MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
- ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
- dHkwHhcNMTMwMzI2MTYzODM1WhcNMTgwMzI1MTYzODM1WjBrMQswCQYDVQQGEwJV
- SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
- c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLm5vdy5zZW1jcy5uZXQw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDspSMFisMgrFl7wbAzbd0d
- 7Mm2vqPTBIx9JUrInCeyptcCL6cYsmkZfD6L34Izf4lXxiFYSeZ9/arLvMrfHw6V
- LHCY1c8Ujlldrf1jWXUlddjV/0jj2bHSpaSkd5Pv2DE+YPbQuWNgEO8LvveJRhsj
- RjdlVb+kp/suP4rV0fE+mBtI0r+fg89NVt0ljGY/fG93jIXZOo+EoRTLQuZdB2p0
- qs/LT/cvicGvD9nlYagx02iRpkRzdEaMd/8K3m9LlUdWAoTE8Pp/gRoDvtjC1b3s
- zNw8bTlb6cnxaNnNkTVhcNVFJU93E+i/tofqdg5SXm1t5XQLBVRn7h+flMhz96dR
- AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
- ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGn2QrAsZmobkkf7vuZiAaeV
- qBTIMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
- CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
- MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
- dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAN99BJdWNmZf2n1X5eDs
- nh+bjmiearQYMxtcGari4biwsLaxboTxWA3RdKAOSiu8mYM/eG9SoafdW5qTv87n
- VvzqCHHHXeXOtizBpnolXO1ggqU5oY8lbIEdGeigfwDCyyKwefLkemv34QpzHWes
- unAmGhPhZk/kNUUgSblqhFu7
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Semantico Limited: Now Publishers Shibboleth 2 SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.nowpublishers.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:info@nowpublishers.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:info@nowpublishers.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml b/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml
deleted file mode 100644
index f8c2676b..00000000
--- a/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbox.charanga.com/shibboleth">
- <!--
- This is an "eLearning" Shibboleth SP for Charanga Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIELjCCAxagAwIBAgIJAL9/L58hDw4wMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9u
- MRkwFwYDVQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNo
- YXJhbmdhLmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNv
- bTAeFw0xMDA2MjkxNTIyMDNaFw0yMDA2MjYxNTIyMDNaMIGXMQswCQYDVQQGEwJH
- QjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRkwFwYD
- VQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNoYXJhbmdh
- LmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNvbTCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYoGZS/WguHq6pRim/vSIB5qhOu
- n6ijPVVZBurlhU7gFfVBPMY5rYdfa0H3h4QGXA9jMYdQKcpH+g7kMrmClQ8azLH/
- d67snvtCHZ81AzIVJjGfOoHucyEVkPas6jgG5RWfpxOzQtYfm0lYc+CuTrkIojwC
- 9wpFRzWL4OEVqy5FiQygjFJBI5CpDG2EmEY+XKjp+AfAxvvZ5Vyk07Rm9gQmrk99
- m0qG6g5JJa68p/v8VmTannqtyERmmb4PMfRjilXgWYkZegBn0pj2ltFZVKp/F0sr
- 5oVxHQE/rhxWtSz43C6yEGaZ8jIoTReQzn+ouCI4WEjJlIBvEPVnpofu34cCAwEA
- AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
- ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMruJSo1sytozEbczKQEttLtBtmmMB8G
- A1UdIwQYMBaAFMruJSo1sytozEbczKQEttLtBtmmMA0GCSqGSIb3DQEBBQUAA4IB
- AQBdR/7rtP4OTHjxidRF98wl6Rd/fXvEs/YdjCQlxFXNQhbT/r9TiX9Y0FCNlJYr
- uza26IEc8Dm4oA//8eWV96mD7KErkUBvzojhkovHcOjdsFG8ceuJnpEvHkM2rDqC
- pKD5W56d97cUdLuyAtPVjl5ho4aF0achwbrBuGXg/VpzCBzHP02WmEuxBBkhIFLV
- XZ2jOgpiCSrVlDNm2X6Chg9g/tfgK30lN0GImnnzzSHuRlFTxgwKuDV4JeuqTsvf
- 0ImlveH8IqR28SFnSUED+nylj0Ap/8RB58BHLlZN5R6bUTKRFRdNeESGNH5i+NRc
- lvxdpwxr83npRdyMleyUtAKF
- </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>
- MIIELjCCAxagAwIBAgIJAL9/L58hDw4wMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9u
- MRkwFwYDVQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNo
- YXJhbmdhLmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNv
- bTAeFw0xMDA2MjkxNTIyMDNaFw0yMDA2MjYxNTIyMDNaMIGXMQswCQYDVQQGEwJH
- QjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRkwFwYD
- VQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNoYXJhbmdh
- LmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNvbTCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYoGZS/WguHq6pRim/vSIB5qhOu
- n6ijPVVZBurlhU7gFfVBPMY5rYdfa0H3h4QGXA9jMYdQKcpH+g7kMrmClQ8azLH/
- d67snvtCHZ81AzIVJjGfOoHucyEVkPas6jgG5RWfpxOzQtYfm0lYc+CuTrkIojwC
- 9wpFRzWL4OEVqy5FiQygjFJBI5CpDG2EmEY+XKjp+AfAxvvZ5Vyk07Rm9gQmrk99
- m0qG6g5JJa68p/v8VmTannqtyERmmb4PMfRjilXgWYkZegBn0pj2ltFZVKp/F0sr
- 5oVxHQE/rhxWtSz43C6yEGaZ8jIoTReQzn+ouCI4WEjJlIBvEPVnpofu34cCAwEA
- AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
- ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMruJSo1sytozEbczKQEttLtBtmmMB8G
- A1UdIwQYMBaAFMruJSo1sytozEbczKQEttLtBtmmMA0GCSqGSIb3DQEBBQUAA4IB
- AQBdR/7rtP4OTHjxidRF98wl6Rd/fXvEs/YdjCQlxFXNQhbT/r9TiX9Y0FCNlJYr
- uza26IEc8Dm4oA//8eWV96mD7KErkUBvzojhkovHcOjdsFG8ceuJnpEvHkM2rDqC
- pKD5W56d97cUdLuyAtPVjl5ho4aF0achwbrBuGXg/VpzCBzHP02WmEuxBBkhIFLV
- XZ2jOgpiCSrVlDNm2X6Chg9g/tfgK30lN0GImnnzzSHuRlFTxgwKuDV4JeuqTsvf
- 0ImlveH8IqR28SFnSUED+nylj0Ap/8RB58BHLlZN5R6bUTKRFRdNeESGNH5i+NRc
- lvxdpwxr83npRdyMleyUtAKF
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Charanga Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Charanga eLearning</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.charanga.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Help Desk</GivenName>
- <EmailAddress>mailto:helpdesk@charanga.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jay</GivenName>
- <SurName>Caines-Gooby</SurName>
- <EmailAddress>mailto:jaygooby@charanga.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml
deleted file mode 100644
index 50884228..00000000
--- a/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibfederation.scientia.com/shibboleth-sp">
- <!--
- This is a Shibboleth SP for Scientia 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 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://shibfederation.scientia.com/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Scientia Ltd</mdui:DisplayName>
- <mdui:Description xml:lang="en">Suppliers of resource management software, including timetabling and room booking, to higher and further education institutions</mdui:Description>
- <mdui:Logo height="106" width="145">https://shibfederation.scientia.com/SciLogo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC7jCCAdagAwIBAgIJALUmSoZ/nhXKMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWNhbS1ocS1kLXNoaWIwHhcNMTIwMTA1MTIzNzI0WhcNMjIwMTAyMTIzNzI0
- WjAYMRYwFAYDVQQDEw1jYW0taHEtZC1zaGliMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAvvEtt6F0MPyMWhtA09h6qNKFwRoVVVK//Ob4WbTMkjjuO1QP
- jFT958wdcKdwIam0d5pg0cx/UaYUUJ0EdXMh4Q6yZNS93WrRtodCnUupAqh4KiiW
- uKVpNN5zcM+uUwvK1PIksL+KXmj8xUZkho/iD8hnY53Kdd7p9qAx5KZIo0nH07ja
- nvQhtJjqlhF7DndPXQqCHs7SgP3DRUVQyxTfFz0soqwgLNSFN98k+P0HUrgWyL2O
- UWCLMk3l1nUYvo4vFKnrQsrkGudico9LIO6pemDzKoGWuJGvdzPfUqOYTraOZEW7
- 8p34N3qSDFLFK0mmkuDEzEJinbgv5lg44i9RtwIDAQABozswOTAYBgNVHREEETAP
- gg1jYW0taHEtZC1zaGliMB0GA1UdDgQWBBRr4P0aIY3MN4nd8qZuZGwCoktgWDAN
- BgkqhkiG9w0BAQUFAAOCAQEAcV9DdlcmZzYNK8X5n2nGmFOefRJLV8FHaw8R0Q5c
- SUhUljXnPsg9QdVXs9FQDFublEKxzLkfr2rxiwL5oQKAyhEbYMjRLi0giCQ+zELy
- xqT2IDXConQSIxOnlDEv7a0QCqy7luUpRbW+m8c5l9Q/02y9A7CN0AfU99yLzua6
- mGdq90mfCHKbGw1fsxmOFwUFTPjYkJ6V9BoKAx46IrmahvllnGIRjUMYkcQcM+qN
- 0IDuIE9DmXK2avh/8h4afo2uRZVKxTLi/e4nrk/hZGdOaREmzxYTh18IZ85+JdDY
- xpo3Zin7muZ026j4rqBuHFQyAaJoKcKU2m8kaKte2Mym8Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibfederation.scientia.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Scientia Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Scientia Service Provider</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.scientia.com/uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Richard</GivenName>
- <SurName>Bulman</SurName>
- <EmailAddress>mailto:Richard_Bulman@scientia.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mike</GivenName>
- <SurName>Strong</SurName>
- <EmailAddress>mailto:Michael_Strong@scientia.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml b/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
index 172a834c..9c5f21dd 100644
--- a/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
+++ b/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signin.studentmoneysaver.co.uk">
<!--
- This is "Student Money Saver" Own Implementation SP for Student Money Saver Ltd.
+ This is a "Student Money Saver" Own Implementation SP for Student Money Saver Ltd.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-03T08:33:07Z">
<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">
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Student Money Saver</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index 5935a3c2..00000000
--- a/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://solo-dev.bodleian.ox.ac.uk/shib">
- <!--
- This is a Shibboleth "development SOLO service" SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-08-02T09:29:59Z"/>
- </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://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEXjCCA0agAwIBAgIJAPIgssUDFSzVMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
- VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
- IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSMwIQYDVQQDDBpz
- b2xvLWRldi5ib2RsZWlhbi5veC5hYy51azEuMCwGCSqGSIb3DQEJARYfc2ltb24u
- bWNsZWlzaEBib2RsZWlhbi5veC5hYy51azAeFw0xMzA4MDExNTQzMjRaFw0yMzA3
- MzAxNTQzMjRaMIGvMQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYD
- VQQKDBRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGli
- cmFyaWVzMSMwIQYDVQQDDBpzb2xvLWRldi5ib2RsZWlhbi5veC5hYy51azEuMCwG
- CSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvZxJ+caJPEyeOKUCDpxCorxYXA
- gjxmXF5eia6O+3osrGkSsGcJVPonOM+4q5M//Fac712g7IKctYb0qyXW9AySECzT
- K97wc2ipA8CrsO6WDn/OdP7+046grKrsebCA/lD4QPt9g3fnHL71cXGDFTxfviNw
- by0Tm+ky2kCn9VjQ2LS+mlnvT/0k/KUnHE2t3RuD9R4n+W8UL8gVqSAcsK+TwfBG
- 6jGvkPXdtzDmhcpJtg2NHGyvSWaOfi3UMFKbUithVKD8lODXT0V5kNkCTXzSJ+KT
- GFdnajEVh824e2i7ncVG7rEKT7DXy++Q/O1FN0r2nTkcNK7K/wlXm7xsuDcCAwEA
- AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
- ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFK2cTGkvAfXnkkIA0TYWaSP+rBeUMB8G
- A1UdIwQYMBaAFK2cTGkvAfXnkkIA0TYWaSP+rBeUMA0GCSqGSIb3DQEBBQUAA4IB
- AQCDb2fRtR3NBPHJv6/CEABkkM4M36YfPNTreUu4POStDXiLJat12vzVwd73YYTL
- jLRTLzUybvy8DfYieF/9h3jgtO5b9lLJy1MARXsi8ESNjBY+T9g/8Ele9ZvrBiNH
- SlowrQCG+L137zKlSwIakv9yPfIK+GoEaz6a4hVglxAsip60FGAbM3Tv+WsJNraD
- 82EzLVYI5MXAk7qcsYBenWo4EG5PVquqOOS1l1WjdnnY/hHky6NYXm9whp0gNm/V
- xFbXEjzuiRklrfzb0OZYHQPZdkY+UfB4XOvmcF1J7aMpDDm8FdWUn4XY6IRPThH8
- F+k7SwJUiw3OvQvFChsEMFm7
- </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://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford development SOLO service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index 993bc3f1..00000000
--- a/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://solo-prd.bodleian.ox.ac.uk/shib">
- <!--
- This is a Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-08-30T09:30:23Z"/>
- </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://solo.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEYDCCA0igAwIBAgIJALCeRD5Ey6eDMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
- VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
- IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSQwIgYDVQQDDBtw
- cmltby1wcmQuYm9kbGVpYW4ub3guYWMudWsxLjAsBgkqhkiG9w0BCQEWH3NpbW9u
- Lm1jbGVpc2hAYm9kbGVpYW4ub3guYWMudWswHhcNMTMwODE5MTI0ODM4WhcNMjMw
- ODE3MTI0ODM4WjCBsDELMAkGA1UEBhMCR0IxDzANBgNVBAcMBk94Zm9yZDEdMBsG
- A1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsMEkJvZGxlaWFuIExp
- YnJhcmllczEkMCIGA1UEAwwbcHJpbW8tcHJkLmJvZGxlaWFuLm94LmFjLnVrMS4w
- LAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzd/glHdFqitXdRfTGqzwzfGS
- pOKkqcZIUoxXJEuxnJ3dLgIALQMYu68UjS2W3WCZKF+k4MOXpitKFAmbFIcEi1/q
- +jbuPiSIRXrWz6iqbpOZq5CZQriq3FYqewcYdNNxRNPqbgP9hWE66l2jmUTONv0K
- He6UxllWYc/AFwsilPD9sX4np/qh3Q6a+zB1VE2f10rEzliqrYQ9ysNLHoX0lKd9
- bX1VvqHcImn9kInq14JEDi/3wYst61K975KbCTTwlfLdujwnFvfa9aUl3RCu4NcL
- TD0/XI6MjW4rIJE4/CJEeJ2+hrUJHQk+7s70bvABthrSvGVR3j9iGf0OJ+kKKQID
- AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
- YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhcoljC8tV5EYZVtPEHERLNhg0Lcw
- HwYDVR0jBBgwFoAUhcoljC8tV5EYZVtPEHERLNhg0LcwDQYJKoZIhvcNAQEFBQAD
- ggEBAKFyCfTM1nEAMq9VubPmfl/ZM4hs7H8CJQPZ2s2JPJR3nlB7qs/7zRou89R+
- I+J6eKQHyvxSLQYIp+4NwZ3Y8WYeDLc774bt3YK0KOSbgn5Fxm9yk8vArFCsGgq4
- JmcylYYxEwwoyaivlDzBFyIINOz4fVMB2pU8nKfRc9WDp3O3kXMDZNRvGikPn3wS
- euArapbRdg9RK9zs0vrqTZST4Q9BrNY4ER4NmfYXs7UIJBQ+ZXvg3B+GO3gBmBQ0
- JX0GvDm9yo7Xori5a5cwo8I2TGwtSe+g9fh3f5Lmpj4re5r5ejlLXpqiWF31VvD5
- Q3Km7nTnYkPWfM66yqBgn/yqO5c=
- </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://solo.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford's Bodleian SOLO Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index ff873ef8..00000000
--- a/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://solo-qa.bodleian.ox.ac.uk/shib">
- <!--
- This is a "Bodleian Libraries QA/test SOLO service" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2013-10-18T13:27:07Z">
- <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://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEXDCCA0SgAwIBAgIJANKEvVlt+w2GMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
- VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
- IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSIwIAYDVQQDDBlz
- b2xvLXFhLmJvZGxlaWFuLm94LmFjLnVrMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5t
- Y2xlaXNoQGJvZGxlaWFuLm94LmFjLnVrMB4XDTEzMTAwMjExMDIzMFoXDTIzMDkz
- MDExMDIzMFowga4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZPeGZvcmQxHTAbBgNV
- BAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLDBJCb2RsZWlhbiBMaWJy
- YXJpZXMxIjAgBgNVBAMMGXNvbG8tcWEuYm9kbGVpYW4ub3guYWMudWsxLjAsBgkq
- hkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hAYm9kbGVpYW4ub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsSr8kv9nT1/q/4nj1PQTMFz6TNvE+
- vNDC6OEKdrfRGNSF3Bynhn7wsp5J/BzcOlS6eFB3hGl3XnbzBPsXB/nlPQgqz3AX
- psJC5B8w/4N4WDj2EtSdLIrcOe8ENHP/Rp4hITjgI++YbnMUCVeeMYoKHLWR1QmX
- HO+1EmTGeECZKQV4BHlvnLDcJ2WpSyAJJRybRkYb8YaTzL1L92wzk+EZreppkLt4
- Qz8PhuRUKYKX0a1y6j+2aKBI2cAi3ciftK9oDva3u7CzjAvZ2H6Twmv0IsUNncIe
- iQqmamoCb2HQlEXrVw9edMd4nPvzrWAx9plzSOJoQMAKnW2we1t1HAJhAgMBAAGj
- ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
- IENlcnRpZmljYXRlMB0GA1UdDgQWBBSaMBPRVamznkbIVr8XEepipygz7TAfBgNV
- HSMEGDAWgBSaMBPRVamznkbIVr8XEepipygz7TANBgkqhkiG9w0BAQUFAAOCAQEA
- OO37gVWuVmsOtukeie3dwFMMG+lWihswACJNQBQ75DuN0L92PL+Vr85qoK0QqCFV
- /IZJvAbAa7hA4GnLbCqb9e/wTv6Y7XLXzWW5tEwTQBgiuqnh2mv8rEUtBaLKCFKq
- XYFkA5QpJPuWnApMHBw9Ilgaygy/MYn1kay5OJ4A0iTMnnKlPHel7T3zxyXeRX1C
- +zygRQi8ayDN0ENItW0sO0/nGTbPmYEbMZ1g/duin1x1ql33MAoCdPxSclPNvUN4
- 7ECVkveDwi2J8q8OQ0pjkn12zYAm5DGVaFS6pcBq+bEKUEWI4nIgfmUiHy6LLPK6
- 0XHX1lZYfOrciG30TyZ4nA==
- </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://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Bodleian Libraries QA/test SOLO service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>McLeish</SurName>
- <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 6bd34f99..00000000
--- a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://some-develsp.some.ox.ac.uk/shibboleth">
- <!--
- This is a "Somerville College SharePoint01" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-16T15:43:15Z">
- <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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRDCCAiygAwIBAgIJANXhSSqDSViiMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGnNvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrMB4XDTE0MDYxMTE0MzU0NloX
- DTI0MDYwODE0MzU0NlowJTEjMCEGA1UEAxMac29tZS1kZXZlbHNwLnNvbWUub3gu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXH7lw13G4eqAT
- prFxI+KMrjJs8IjKlnsfsHcBkHTwyPLf8hL9Ia5lJMtBhbJrTcv/fznsAnbzUo0I
- nncmCF5tQFljOap2VhPCFKm79JZ69bL/Eu5o5bqiv/njw/PfdiiIR3x3cdqwPWOr
- 2aNuzoNVQzlXFK0v3Mt927MXZZ4BUpbtPaP3NjxHfEktZhCH/R2duFNz16azWWul
- Pch0Jw9D+4XMeF6i8CqeBEgmawZFN0cb5sgPcoacMhNmd5lMd8Ami+qfsmFlp05t
- HB6fMY47pYy/O5RvYskgdftCCGuDIu89UmiWmNjHPytv6VeoPAyTAW7kehdpa85j
- 9bn/cBdfAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNvbWUtZGV2ZWxzcC5zb21lLm94
- LmFjLnVrhi1odHRwczovL3NvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrL3NoaWJi
- b2xldGgwHQYDVR0OBBYEFG0CsUCHIt0y9PN0th+wQkPelh/OMA0GCSqGSIb3DQEB
- BQUAA4IBAQBxVrg19YoV4XxXSNhaPYcjbWyZgZ41mB5AVrG87TOHh8mxBkbKLLAU
- ZR+c3JqU4zSfle0zPFtD2IZyqbGoojswc482B5ZTltUGjLycfvNksfTT1C0/w50g
- +Je9Njn4evUuw62XBPBG9m4S9pPCuKe28zmWWC/MjFQenK43TYU4Unud3OoyEMHY
- sRW3pdor018DiAv0bV1q7r2KaWaEZWbgFtdqWYxU/R7VhFYKj9wWHs5DLIAnpmkc
- xrs3kV6juklNJUG4pICaF88CW9Zcd4d6B4O26HeShWAD1X37iJVfdAqAgTXXLyvj
- 0rrgwvOpovrO2SefkaQVmpAqclAivahc
- </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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Somerville College SharePoint01</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml b/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
deleted file mode 100644
index 4b6f4648..00000000
--- a/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.canstudios.com/shibboleth">
- <!--
- This is a Shibboleth SP for Boardworks Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
- BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
- Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
- LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
- WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
- hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
- zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
- I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
- TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
- NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
- dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
- AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
- 0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
- WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
- icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
- SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
- zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
- </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>
- MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
- BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
- Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
- LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
- WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
- hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
- zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
- I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
- TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
- NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
- dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
- AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
- 0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
- WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
- icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
- SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
- zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Boardworks Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks Test</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.myworks.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Catherine</GivenName>
- <SurName>Marks</SurName>
- <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Catherine</GivenName>
- <SurName>Marks</SurName>
- <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
deleted file mode 100644
index 2472833f..00000000
--- a/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.wortech.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 SP for Heart of Worcestershire College.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
- MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
- +6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
- J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
- SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
- S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
- TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
- BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
- SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
- 7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
- 4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
- 58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
- mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
- I64R7eQVc7Z6kw==
- </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>
- MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
- MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
- +6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
- J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
- SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
- S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
- TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
- BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
- SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
- 7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
- 4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
- 58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
- mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
- I64R7eQVc7Z6kw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Heart of Worcestershire College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Worcester College of Technology Test Service Provider</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Services</GivenName>
- <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Services</GivenName>
- <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml
deleted file mode 100644
index 8bcac9d8..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/depot">
- <!--
- This is a University of Edinburgh (EDINA) Service Provider for 'The Depot'.
- -->
- <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>
- MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
- VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
- MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
- RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
- ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
- pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
- YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
- A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
- 9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
- RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
- igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
- asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
- rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
- w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
- SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
- FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
- 4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
- gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
- u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
- iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
- xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
- TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
- </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://vsp2.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="10"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
- <OrganizationDisplayName xml:lang="en">EDINA: The Depot</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.depot.edina.ac.uk/about/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>EDINA Helpdesk</GivenName>
- <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Soares</SurName>
- <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml b/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml
deleted file mode 100644
index cf7f65e4..00000000
--- a/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.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://sp.gigajamvle.com/shibboleth">
- <!--
- This is a "GigajamVLE" Shibboleth SP for Interactive Music School Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJAKL0Rd2ZS0IhMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC3NlcnZlcjUwNjg1MB4XDTA5MDYxNTA4NDU1NloXDTE5MDYxMzA4NDU1Nlow
- FjEUMBIGA1UEAxMLc2VydmVyNTA2ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQC7qvdYa5Ntk80wfZrtkJTFwAI9Cdx88C0Ql9/nab/L7oXVdNO3IgGx
- bQqI0P71yCA//g5oJrnaQstNPA1pjq9wJsn6Dppy8+DQTOaYmJAZbt2dZ2JJZQPs
- 5THow+T6BbXGKtEVmKBtkvCuyK9uRlSHu/B6gQCsEeCCk+zZA9XP7rGxvEddWD2Y
- rhmNpe4P9k5QzFbW7fBIgCC+v8tE2U+4ufm9AY1whs+VgKLS8F7hYGnjjQAM62mC
- E+4M/9UgNt30TSwUcHmaDw0S6obsOUY+pH2kUdiNL3IPfd5/RTwcbm90kgae1ks3
- MrOXjRxnKx3dS0KwMVBbjgPW89CYPTlRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Nl
- cnZlcjUwNjg1MB0GA1UdDgQWBBSGpWMub0XU+qKZm5q1SOxMSPBqPDANBgkqhkiG
- 9w0BAQUFAAOCAQEAD54bxpNe9K1R0GDlV/q3Y4SrAGRps7//DdtqBE1VgvYYxKNn
- liNEGxWKg7fe9NNXUsnlbkmGFzgvbUlfAiRhprB8yEeKOCfCzpEem6I7qQiRk1vP
- bdYf3nxNr1AYf71QskQrVcG4NazrOEBhscNBZNzDdgYJh9iHMWOKoAwOXAux7rwj
- wmvyOXcT8nYskOwgP+S6bY9Nujy4N3zOK67MWQUeGaDk+Dy2MWeE4HALRS1uekZO
- GQLj4hRRG7q1Bd+rjyh4YI3FtCDrmTk9ZtVL2OigpRhl4zF46htqt7B1EoZrG9V7
- U7cJNLDizKNwHettuv1vTwydaCIJ4VQ8cvkIaQ==
- </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>
- MIIC6DCCAdCgAwIBAgIJAKL0Rd2ZS0IhMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC3NlcnZlcjUwNjg1MB4XDTA5MDYxNTA4NDU1NloXDTE5MDYxMzA4NDU1Nlow
- FjEUMBIGA1UEAxMLc2VydmVyNTA2ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQC7qvdYa5Ntk80wfZrtkJTFwAI9Cdx88C0Ql9/nab/L7oXVdNO3IgGx
- bQqI0P71yCA//g5oJrnaQstNPA1pjq9wJsn6Dppy8+DQTOaYmJAZbt2dZ2JJZQPs
- 5THow+T6BbXGKtEVmKBtkvCuyK9uRlSHu/B6gQCsEeCCk+zZA9XP7rGxvEddWD2Y
- rhmNpe4P9k5QzFbW7fBIgCC+v8tE2U+4ufm9AY1whs+VgKLS8F7hYGnjjQAM62mC
- E+4M/9UgNt30TSwUcHmaDw0S6obsOUY+pH2kUdiNL3IPfd5/RTwcbm90kgae1ks3
- MrOXjRxnKx3dS0KwMVBbjgPW89CYPTlRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Nl
- cnZlcjUwNjg1MB0GA1UdDgQWBBSGpWMub0XU+qKZm5q1SOxMSPBqPDANBgkqhkiG
- 9w0BAQUFAAOCAQEAD54bxpNe9K1R0GDlV/q3Y4SrAGRps7//DdtqBE1VgvYYxKNn
- liNEGxWKg7fe9NNXUsnlbkmGFzgvbUlfAiRhprB8yEeKOCfCzpEem6I7qQiRk1vP
- bdYf3nxNr1AYf71QskQrVcG4NazrOEBhscNBZNzDdgYJh9iHMWOKoAwOXAux7rwj
- wmvyOXcT8nYskOwgP+S6bY9Nujy4N3zOK67MWQUeGaDk+Dy2MWeE4HALRS1uekZO
- GQLj4hRRG7q1Bd+rjyh4YI3FtCDrmTk9ZtVL2OigpRhl4zF46htqt7B1EoZrG9V7
- U7cJNLDizKNwHettuv1vTwydaCIJ4VQ8cvkIaQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigajamvle.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigajamvle.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigajamvle.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigajamvle.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gigajamvle.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gigajamvle.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Interactive Music School Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Interactive Music School Limited: GigajamVLE</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://gigajamvle.com/about/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Iain</GivenName>
- <SurName>Norman</SurName>
- <EmailAddress>mailto:support@gigajam.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Iain</GivenName>
- <SurName>Norman</SurName>
- <EmailAddress>mailto:iain.norman@gigajam.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
index 04f4e03d..8323abce 100644
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
@@ -108,13 +108,11 @@
<OrganizationURL xml:lang="en">http://wiley.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Zhiming</GivenName>
- <SurName>Chen</SurName>
- <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:wps-olhelp@wiley.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Zhiming</GivenName>
- <SurName>Chen</SurName>
- <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:wps-olhelp@wiley.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml
deleted file mode 100644
index 39ac2814..00000000
--- a/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.primaryblogger.co.uk/shibboleth">
- <!--
- This is a Primary Blogger Shibboleth 2.3 SP for Primary Technology.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAOZHOEMKBHC2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDgyMzUxNThaFw0xOTEx
- MDYyMzUxNThaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgEkbr2RKR4I0utlNh/vw1jX7p0
- i7kqSW+nn6yL0AkkoTCheUI7wG+g0tr85EI8NJDgjn32VTuwKuvZfG8Glq6egaN3
- gYTrZobvMpeGE5EdkFDRqGdecxjaNoVnVJypPo2h6WYiID7AvHb2+HWMcwa4sboH
- ROg+xUA9WEuD0NHXiNgM7Olq41GDGnfkpra3xIQyuTdqi8m4BeKx0C37twr7cuEf
- dDUI/obOQXGKMaq7o0vEIRIzQAVkiYdwHhT0QCZ9iy8TdNzLymGHqqwWUql3kADh
- d4JF159CUg4DfC+nOOsyrBrALcKQrnvPG/m9co8RXE1uUjdU/3Eu/KcM0wUCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
- BBRocwEiryFGPISri/h1VtntIAhbuzANBgkqhkiG9w0BAQUFAAOCAQEAebIJkE/j
- XykPygSsAdZVXKw/udtaFkWOnTQCjfUpJClLnuTwTSwd4n5yp+YbQ5OK3i9TsziF
- vIF8Ef6Lu7CBDEgKqQbQaiRSPSGV83eCcQ3dPMz3Y7e0b1N5VJZ2+PdOvU0G62ti
- P40Lq5ggDCKejJNh/G/3cZ13ycwUZ7e5tqS0dcCKqBNvDLbYEGa9jjClclFOyDv8
- 3fDaIHNHpBeXqtP3TOkAAkdBLQrdvuA2DOYl1fNLMFFKKP8ARt9zTwNCEyLuzSmG
- +gFtPl/xOz4ha0mucdRHuztOM32CHnYO8dv4s6hr0hWVu5rt+msf4UN1lgNd3lVf
- LzHzZem0YfRmWw==
- </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>
- MIIDBjCCAe6gAwIBAgIJAOZHOEMKBHC2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDgyMzUxNThaFw0xOTEx
- MDYyMzUxNThaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgEkbr2RKR4I0utlNh/vw1jX7p0
- i7kqSW+nn6yL0AkkoTCheUI7wG+g0tr85EI8NJDgjn32VTuwKuvZfG8Glq6egaN3
- gYTrZobvMpeGE5EdkFDRqGdecxjaNoVnVJypPo2h6WYiID7AvHb2+HWMcwa4sboH
- ROg+xUA9WEuD0NHXiNgM7Olq41GDGnfkpra3xIQyuTdqi8m4BeKx0C37twr7cuEf
- dDUI/obOQXGKMaq7o0vEIRIzQAVkiYdwHhT0QCZ9iy8TdNzLymGHqqwWUql3kADh
- d4JF159CUg4DfC+nOOsyrBrALcKQrnvPG/m9co8RXE1uUjdU/3Eu/KcM0wUCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
- BBRocwEiryFGPISri/h1VtntIAhbuzANBgkqhkiG9w0BAQUFAAOCAQEAebIJkE/j
- XykPygSsAdZVXKw/udtaFkWOnTQCjfUpJClLnuTwTSwd4n5yp+YbQ5OK3i9TsziF
- vIF8Ef6Lu7CBDEgKqQbQaiRSPSGV83eCcQ3dPMz3Y7e0b1N5VJZ2+PdOvU0G62ti
- P40Lq5ggDCKejJNh/G/3cZ13ycwUZ7e5tqS0dcCKqBNvDLbYEGa9jjClclFOyDv8
- 3fDaIHNHpBeXqtP3TOkAAkdBLQrdvuA2DOYl1fNLMFFKKP8ARt9zTwNCEyLuzSmG
- +gFtPl/xOz4ha0mucdRHuztOM32CHnYO8dv4s6hr0hWVu5rt+msf4UN1lgNd3lVf
- LzHzZem0YfRmWw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Primary Technology Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Primary Technology Limited: Primary Blogger</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.primaryt.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>McLear</SurName>
- <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>McLear</SurName>
- <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml
deleted file mode 100644
index 103c56d6..00000000
--- a/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.primarylogon.co.uk/shibboleth">
- <!--
- This is a Primary Logon Shibboleth 2.3 SP for Primary Technology.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAJEKbmu/vCH3MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDcwNDU0NDBaFw0xOTEx
- MDUwNDU0NDBaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7lMkqj6Sxq7AexnModmAyRAUTx
- YHjriZnM6f7X8+QI8VYMXxvSHtA7HGmihqtSN/1A1Y0KuCF0Qs3nD5mrc6MT7bo9
- yKOgy5lYMV3gAdTxWj8EwKxdfdVNXM/AuqE0zPNtft56Owx0OkCUIBAabcTFVn5p
- TdTa8d8KaxFmHQFnsrFKMm2EcXJrJMU3uBvlOLeAn5Wv88prnghIwMz81VZ9NXPC
- aG4BYUNPXKgFbzAScFj8DVftSanhN9CPCEO2LhQl7u9O0DVEA95iyTabEG1eJyoY
- yZEsvRbeliHAaAZWzaw8d/7T9D72MqVYYVkbshHGs1MYnxSdRC1ANSu/utUCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
- BBSQ00uRX/jErFhgECxBXIKkX9nOZTANBgkqhkiG9w0BAQUFAAOCAQEAwzhPMTAw
- 7+kNYCssU8JOywDnM90RKKEa1Te+WaknFIWTz+m7hGeCWnjtyMugcszVp+CEwOqb
- /LfOGM0ShQR6obvcM5VlH/xiHKehNVllQeuTWYujv9jdruO/Wr2sBA/y8aREczkF
- OQzugXsXyhPY4m++zmEBuACnEXzc3Ew/hBCWvyU3aKKOHcC/RTipEO7Ouh87CTpd
- /TDfAurDdKg6puGSzPyDVwiwFd6LBghyvs4+/aN4Stz0Y4KzUpBLCQ6wOgXbiZr3
- XJd0Lv5uSEgCMCJLNmufrXzG8Ygi4fCiOlWFIcFhWkWqNwd+ZTds6K04wdYGL3bA
- uNL0cvubK2qd7Q==
- </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>
- MIIDBjCCAe6gAwIBAgIJAJEKbmu/vCH3MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDcwNDU0NDBaFw0xOTEx
- MDUwNDU0NDBaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7lMkqj6Sxq7AexnModmAyRAUTx
- YHjriZnM6f7X8+QI8VYMXxvSHtA7HGmihqtSN/1A1Y0KuCF0Qs3nD5mrc6MT7bo9
- yKOgy5lYMV3gAdTxWj8EwKxdfdVNXM/AuqE0zPNtft56Owx0OkCUIBAabcTFVn5p
- TdTa8d8KaxFmHQFnsrFKMm2EcXJrJMU3uBvlOLeAn5Wv88prnghIwMz81VZ9NXPC
- aG4BYUNPXKgFbzAScFj8DVftSanhN9CPCEO2LhQl7u9O0DVEA95iyTabEG1eJyoY
- yZEsvRbeliHAaAZWzaw8d/7T9D72MqVYYVkbshHGs1MYnxSdRC1ANSu/utUCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
- BBSQ00uRX/jErFhgECxBXIKkX9nOZTANBgkqhkiG9w0BAQUFAAOCAQEAwzhPMTAw
- 7+kNYCssU8JOywDnM90RKKEa1Te+WaknFIWTz+m7hGeCWnjtyMugcszVp+CEwOqb
- /LfOGM0ShQR6obvcM5VlH/xiHKehNVllQeuTWYujv9jdruO/Wr2sBA/y8aREczkF
- OQzugXsXyhPY4m++zmEBuACnEXzc3Ew/hBCWvyU3aKKOHcC/RTipEO7Ouh87CTpd
- /TDfAurDdKg6puGSzPyDVwiwFd6LBghyvs4+/aN4Stz0Y4KzUpBLCQ6wOgXbiZr3
- XJd0Lv5uSEgCMCJLNmufrXzG8Ygi4fCiOlWFIcFhWkWqNwd+ZTds6K04wdYGL3bA
- uNL0cvubK2qd7Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Primary Technology Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Primary Technology Limited: Primary Logon</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.primaryt.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>John</GivenName>
- <SurName>McLear</SurName>
- <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>John</GivenName>
- <SurName>McLear</SurName>
- <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
index 91ad4de0..4ace60d0 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
@@ -32,23 +32,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAK+O24Whf1j9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnNjbWlpc3ZtMDEuc2NtLmludDAeFw0xMjAzMTkyMTE3NThaFw0yMjAzMTcy
- MTE3NThaMB0xGzAZBgNVBAMTEnNjbWlpc3ZtMDEuc2NtLmludDCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMvlGhNSWmeo5NZhKfSSI9+LjR6ydzsFAkJ6
- Ab9rv15257qlPWSWqiU2g6VLS9wQJT34uXBWxKJFnxjz+7e3nsQrStFPzRjUP25L
- QrY4404PIDwn/PzmGCmeaX/6fT97DDET1znoyIUG6u/Z9sj6Ejs7B0M4bNPddKgf
- oXWq/bj5ltNRx5WIfNR++bjNf5z+rg7TLM++DfuhMb+oyXTCJJ7Dm89pWp3Qf9bZ
- S/nSlg8cQUXIV+aeasbR3W97a50ponwXruKxZ8CHFwRtQxuRx92BUAE48Wmsqy8C
- hFfl71FZFRndqAk7QmcGNBtfgh8uBk0AnS/s6RstL84D8GdReRcCAwEAAaNAMD4w
- HQYDVR0RBBYwFIISc2NtaWlzdm0wMS5zY20uaW50MB0GA1UdDgQWBBSl3AvtbnYc
- BN78/OMu1ic7k39ydjANBgkqhkiG9w0BAQUFAAOCAQEAtV2ts6haCyIZOCsp/S1b
- yYO4JPgZ7vpDfNJidIsWBjysOHr+/tdejm4HpEDI1hwbvw2+wDjhWasjTa7u6qtM
- OPg12pcV4pQHtCX6QfPodm2kE+x/hlRNIfo8Qkxm0Y3gIbjkfxNisCL50SBzFtJd
- X88cjx2suAEtEaZj5MMvw1r5/5kfntUqakEr5N8awV3EyV37T808Ntkb58I2C4Iy
- ofGLunRSyqES28AGD84TrEJtLXR1B4Lv/7AQJTcivD22gngPtgMJH/ebyxDXbv9w
- bnNwQSmBaN64Rwb9vczMXqoqPY2xhjI0mUtqSUN+H6LacrhUaqr8wQ0YICpwTktl
- tg==
+ MIIDTjCCAjagAwIBAgIJAJZHv95563KvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+ BAMTHGFubmFscy5hY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNzE0MjEwNDA0
+ WhcNMjAwNzEyMjEwNDA0WjAnMSUwIwYDVQQDExxhbm5hbHMuYWNwcmMuc2lsdmVy
+ Y2hhaXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx3gcRS/n
+ KEJ7E1rnbpEr5bFNSLH05dYeJw8gO5qvgZWS8kEK742uRAy/BDEytNNGru6Kgn2T
+ OKAUXFjqYhpUMZD0dvdrkuIBRLsluyWqHNFKNV2kfxdn2P0Ku5DWrhDERcVjsBCV
+ DV2ZFuLSXUjO//Tf4U3hddnQAmDY+DHzn5JVQc2qxAcm3SauHllpdf2D3ml5jt0C
+ JJ2HjzLe7RjWsB2ZcdfTx53YoBjHs8fQ//a9XueczEEnGLee6KWoOafmJtNUaNJw
+ LUJKMqQ0cwkDGO9+GHXIUv0UZaQqJzOEpassE6pnDWF+lU0QLiKEhLWb4t/raYb5
+ FNw5MX7Dh1KflQIDAQABo30wezBaBgNVHREEUzBRghxhbm5hbHMuYWNwcmMuc2ls
+ dmVyY2hhaXIuY29thjFodHRwczovL3NwLnNpbHZlcmNoYWlyLmNvbS9hY3Avc3Rh
+ Z2luZy9zaGliYm9sZXRoMB0GA1UdDgQWBBTR5Oq0DmD770Dj6nz8AVhHW7M+1DAN
+ BgkqhkiG9w0BAQUFAAOCAQEANTzhu7oiv6sPVeLQJIurSMlWUlVdslHfKtHITuUq
+ rJr2V7ENZqiP96ZExF6rd6gfnrQJW0j0Qlpa3BBmoY1mXKf9ptnU3CeEFF772AL6
+ XqUH7G/qwYzxoybsQSMvcmvnwJtDXJ7/7UElzdnnIOEemewIvWr/JP9uKT4I7QpM
+ H9FxsfFwkiIaC1tljcEjmtmNBqep8/5k9bTY78/FhI2VBWViA9G9SjW/wsTHg2n7
+ yd73sCRREx9PLTR9xwaFTXd3sUKa9twF2Mcelv+YMQ54jDLMYMXYE7sQQAmCJntA
+ XHPzjiDW9qkSn90k3YhY8pW1gd59mGKAZUiC+cQFhlnRFA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml b/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml
deleted file mode 100644
index 959fef6d..00000000
--- a/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sprov.d2digital.co.uk/">
- <!--
- This is a d2 Test Shibboleth SP for D2.Digital By Design Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-26T11:23:11Z"/>
- </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://sprov.d2digital.co.uk/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">d2 Digital By Design Limited</mdui:DisplayName>
- <mdui:Description xml:lang="en">d2 Test SP</mdui:Description>
- <mdui:Logo height="170" width="170">https://shib.d2digital.co.uk/d2-logo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMzCCAhugAwIBAgIJAIdis0SAXmmpMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFXNwcm92LmQyZGlnaXRhbC5jby51azAeFw0xMjA3MjUxMjMzMzlaFw0yMjA3
- MjMxMjMzMzlaMCAxHjAcBgNVBAMTFXNwcm92LmQyZGlnaXRhbC5jby51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbf3pH83WxgptR2EyioaxWy4OMy
- PIxIoJ/ERpNdpTxQqWsjJf4pHcHA/DtbRpX9PFDgGFm604JfmzOj/Wd/U05Wo1MF
- VhlvxgDvdpbANS9rR62f83WZv9WGkxk+N/Bz1haRdRFi3x4/zef3uxwOFJnGHHD0
- Jas1+9nYUv/FxPNXYVDnBp1MfGk6OWlG3OPsemJXPSvgw0iG201oabyx/GWb/e2E
- mi1Yjd65ksVvzdZ6LxZHAUGuyeV3m4wP35EaXjesHJ6Y5CmUZ9dapOGDlavJRjda
- 0Eau3HCAiS0mJ9KZjyOFIgX3oowO+cf+XXpzb3rp1X92wsT707wG5wN+ezECAwEA
- AaNwMG4wTQYDVR0RBEYwRIIVc3Byb3YuZDJkaWdpdGFsLmNvLnVrhitodHRwczov
- L3Nwcm92LmQyZGlnaXRhbC5jby51ay9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBQj
- 6RBpdUzW3y30eT1nnauBiEZ7ozANBgkqhkiG9w0BAQUFAAOCAQEASxk2bIv7u2TE
- Ikm5avZwC0Jg4YmS/vEiMbsbF/cn7KklmdqrKoVZXPHXZGqGO95/Wni81s5ZCAPI
- +Ny0a+4SGufdW6mu7LdzdKsDQTXw+tEGNF3+7FMyTaW9Ey4cQt+RgIUy/injMwnR
- w5dC9P3x/w5PlmNgD8TTsKWeLoonP4y6RdtgsW7h33zylG5PdHmremgGmiKYr0mT
- u5EpXfUGl1A/HdGkUYIP4AYxz0MB1K2ZdLrWtFqP1kgT8+iwxIh/v+PEVZ8ltU91
- xdRbHTBf3Fd/8gVhZw4lSDWFHbyJDznGTYE6H5UyxgLqGI/KgQfMxDVdqXQhZ0Hu
- UZV+Z3CP5w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">D2.Digital By Design Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">d2 Test Service Provider</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.d2digital.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Adam</GivenName>
- <SurName>Thorpe</SurName>
- <EmailAddress>mailto:shibboleth@d2digital.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Adam</GivenName>
- <SurName>Thorpe</SurName>
- <EmailAddress>mailto:shibboleth@d2digital.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml b/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml
deleted file mode 100644
index c5245718..00000000
--- a/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-edu.datamonitor.com/shibboleth-sp">
- <!--
- This is a Shibboleth SP for Datamonitor Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-25T14:51:54Z"/>
- </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://sso-edu.datamonitor.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://sso-edu.datamonitor.com/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLTCCAhWgAwIBAgIJAPEARr/fSR6iMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3Nzby1lZHUuZGF0YW1vbml0b3IuY29tMB4XDTEyMDUyNTEzMTQxOFoXDTE1
- MDUyNTEzMTQxOFowIjEgMB4GA1UEAxMXc3NvLWVkdS5kYXRhbW9uaXRvci5jb20w
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTb/l1EYurxP9VEh52g0mh
- AUghEgUttKK8pK24M6AycR31By7SIheCo6pl91up5AIklg5b5Duq5fMlBN5WRcln
- jC8sL98QxGS9Rl/F+LowtCxp7uXX9GGQ2NkUwUr4tvjg9HG+9BRDoBRuLLsoD9IJ
- 6nSImBa7gBXlEwh0yPH+9+tHPoI5zXLlY0Ss+pCXA9mU5iseHoYSEsb5EBd0sz+F
- 0galGRXZkVCU3PswP/vJ1AFiXJXfe1FMdBMxpqG/t89EK78RsZAyH6Pg8FplKFXC
- 7h0vLv63Rx1FIodnH9xa6k+5hX1LPk720ueqf+wVJuSJlWuyrAVslyKF6wyUkuTP
- AgMBAAGjZjBkMEMGA1UdEQQ8MDqCF3Nzby1lZHUuZGF0YW1vbml0b3IuY29thh9o
- dHRwczovL3Nzby1lZHUuZGF0YW1vbml0b3IuY29tMB0GA1UdDgQWBBRpkR0vHLfO
- QUjVToJ/aO4n689nzTANBgkqhkiG9w0BAQUFAAOCAQEACRVd/BiZHPRxx1/RR0Z+
- CYjmo/EhnbLZbGzLYVZcr0f0GvG5Z8rqHoIr8JgAjjJ0f/VAKEXR/VWaR6641zho
- NQ91BwXmsNlk+sJPb5UZ7f71fqUbj0P4vD//+3Vv8cgZoSnnbZH8SeILDbEtNNsV
- KK5WBNCHFTNqbZADGT3gbdp2Yqtyqo+0Or4QMFOp5I4pKUZVnfbxdpCL4zha620e
- g7EF6Na72cHBA1e9oCu3fRtKUFvUsY2sGlOQBljN5GIbukKt3eKhDA1F1sfYVj/w
- ZTNxdHOrjQBVdn6vnBjFYzKrNgiZZB9ZCm9Gcb2u0/+77IoDiyCWSbDyI9PbjGmT
- IQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Datamonitor Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Datamonitor - Shibboleth</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://www.datamonitor.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Arun</GivenName>
- <SurName>Dahar</SurName>
- <EmailAddress>mailto:arun.dahar@informa.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Arun</GivenName>
- <SurName>Dahar</SurName>
- <EmailAddress>mailto:arun.dahar@informa.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 70f788d0..00000000
--- a/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-epos.some.ox.ac.uk/shibboleth">
- <!--
- This is a "SC EPOS2" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-27T11:20:50Z">
- <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://sso-epos.some.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIJAJHKGp/+izijMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnNzby1lcG9zLnNvbWUub3guYWMudWswHhcNMTQwMjI2MTUwODM5WhcNMjQw
- MjI0MTUwODM5WjAhMR8wHQYDVQQDExZzc28tZXBvcy5zb21lLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxK24wmjmNTuudz0HDi8xGw1x
- t5v0jh301LqY7sjLKlxd+PoD+YdgdCLQR5gigy3mj/nTSdeAsPYFkhb679SUggS3
- PmD2R0byhHL2e+MgRyG9euiq/e0/JNtKuRugccJFVKHSgr6bXARP4LGpN8H7oou1
- S/I3jQwIvh1GdP/MkolhdgWsts4jRV5c2/m6CzrCvqHFcoyrN0ZUkTP2npNwqAPt
- HvpQncjgUrtNm4v5beC3iCKzvn0q1Img4449MZrQUpAkwONMTb5lFn1emq48f6DF
- cxylRZwY1u3z63k7YOm2mjvvW8axUoH8Mjktq42ZK29scNBzIWv3liHTU/KXIQID
- AQABo28wbTBMBgNVHREERTBDghZzc28tZXBvcy5zb21lLm94LmFjLnVrhilodHRw
- czovL3Nzby1lcG9zLnNvbWUub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
- SgHanJ//YKaw4iZ1IaEUS0q/rRUwDQYJKoZIhvcNAQEFBQADggEBALBM1ASGlxEl
- sJALpwFfz987l1SDYa3fBLXCV9N194MgwtNeQyjoAM2VzWfbIUlCoVJuR8km6j47
- xbZpJpRMKH7pV83RtI//+3Wm9r4R+TYP7woWbnzKgj2wEFM2ce6jkJ+vwcFlS4ES
- W57SDZqlL4C6XqJNRFVAQTFdE0UoBvsSiKGXR8HAm+4MUjSNjrqq3TYqq/Ks/PGh
- xrZT5L+b5jajEf81Ch6WYBBGyFb4GaIw+8aYwzAyS0z+aG9oTJIjehdGnVF/unlc
- OnC87ksYf/icPcU2jtOfL+D3C48ePJ37jKehg9TyDwzy0r2riBc6WrycWWAmyeyh
- FcgVm9Zjv/8=
- </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://sso-epos.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford SC EPOS2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 1afaab61..00000000
--- a/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-meals.some.ox.ac.uk/shibboleth">
- <!--
- This is a "University of Oxford SCMBS2" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-07T09:24:21Z">
- <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://sso-meals.some.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAJ7DgOId94EXMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3Nzby1tZWFscy5zb21lLm94LmFjLnVrMB4XDTE0MDUwNzEyMTc1NVoXDTI0
- MDUwNDEyMTc1NVowIjEgMB4GA1UEAxMXc3NvLW1lYWxzLnNvbWUub3guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXKqSIdFGmx+j/kwnRtIS+
- hp9gFesgW3QaozTA8Xt4rotBm1KyfeCfNngcsouV/xNRd+qgQ1G1HZXOfqguv35X
- orHc07Qdr76CtIGo6u+sjWXgJub9+87rfO7f5s00Is6L6IgIEV3WaWLZjlCdyQ3z
- ZPCmKhU6jmA7HyqINpz7CbK8ChVQIfCYhvjzvXclzfyAypkaV3bCv3Exe61Wkj4g
- QgO4x9NMio2++MZNIuT5oUA3fHCXwSYKMpdmdVTmR+lyb7RjvGOf2pn7TwdEVKG+
- 5D7NtLPH5kXd/FmZjmrbRutaofPQ6iBJqh8MwkEH+6nWHDkXPPcRYNC4bT0uELvr
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Nzby1tZWFscy5zb21lLm94LmFjLnVrMB0G
- A1UdDgQWBBRAagWHG2SqaiNMxN2dQ7m9VvYBxzANBgkqhkiG9w0BAQUFAAOCAQEA
- ksL6qd7gNUh0/YpWGxqeZrbDC1tmFjs2WEG2vMY7Tkms882USrbqPWt9jT4BUkIY
- 9w3R+Ux9ZAfFIS78gbsOtrnY/UvIHu6XspBfgP6o43x7iSZUo+Ky7x2FfYSpu3DF
- C3SthR6n9OrYGTbQct7FzF/QpXnl1emDuzGtKe/a//XnVRevp64w+68G6v8Xs3dS
- ZyISiQ3CkdeZZm9AoFkjX61uofrCaIjwp7ua0igkHU6EiBM7Zl5H4J1l/ddSpGth
- u7LD03PH9+NExHi07hkWrhBhIWF4V+E9Rzo+FJFjTTC+S/bHhfU9Qo2hDti1XekI
- eh55XqSqL91ZRV4UwUs1NQ==
- </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://sso-meals.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford SCMBS2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Somerville College IT Support</GivenName>
- <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml b/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml
deleted file mode 100644
index c58f77dd..00000000
--- a/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.onesource.com/shibboleth">
- <!--
- This is a Shibboleth SP owned by 9 Star Research, Inc, on behalf of OneSource.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.onesource.com/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC8jCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFzc28u
- b25lc291cmNlLmNvbTAeFw0xMDEwMjcxOTMyMjFaFw0yMDEwMjQxOTMyMjFaMBwx
- GjAYBgNVBAMTEXNzby5vbmVzb3VyY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEA0rAmWglWbPqA8WsNSqXmDoP5VXm04RUhsnf51me/R0+Oa+Lg
- jKkGhenXjoEss2F+R4AFClOyBYlWCXcOor01+Ybm6wVjlhqiGsYQj+cT4/nH101C
- mLCydJvqLVTreAAXIeeqrnHNOIL9dKKT9f4rXMd652NmSFRA7Hl6cQV70f2Bd/6r
- 5geLQ+flrJIpvhdXO40GtXOpf5VfX/BtQ3+3j4AZmEABEMCpo1mzO8Cp/d8adsnt
- iJTvp51OggSLWpJPt3foT0afuug1xCl6zP0uySXDaSaAuE/s+nCG0xiZLEs0HTib
- r3t9XXDIo2+gN4IULSn3XJIkXiR1L3BVu5M9UQIDAQABoz8wPTAcBgNVHREEFTAT
- ghFzc28ub25lc291cmNlLmNvbTAdBgNVHQ4EFgQUBf9CwdAc1mBKZS6BJMndqkOQ
- ccEwDQYJKoZIhvcNAQEFBQADggEBAHt0L5MxCaW+HF4r16kVr3GTAzjl/oQArntL
- gK5rSvzn5vBGOYwRqoOqOyT0KIg5x95mssw8DIonSOZKkBERkFcKdjW77vfaKWMM
- XbQyZQF9Udsf49yCac4/SEEDHqWVVB7uMngkx5FzU4dSwz+K7M9mlc1qpT0sYZc/
- sMZlncHSACTa9ClqnABgSRK5VxYAaqLflKFLDwR2pBVBZzX4GQ6iMkRLpfKYakHY
- 90CPLNchMKTaFTDS0LQkkQ+PqzE2OTlf8ov8ppzVLVN5ZLemuX9i9GNzLOoeW6dr
- XQgb23tk8eDNQABBWA7armXrmBXD1G1EQv6J+PqHowTqu2mI2qo=
- </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>
- MIIC8jCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFzc28u
- b25lc291cmNlLmNvbTAeFw0xMDEwMjcxOTMyMjFaFw0yMDEwMjQxOTMyMjFaMBwx
- GjAYBgNVBAMTEXNzby5vbmVzb3VyY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEA0rAmWglWbPqA8WsNSqXmDoP5VXm04RUhsnf51me/R0+Oa+Lg
- jKkGhenXjoEss2F+R4AFClOyBYlWCXcOor01+Ybm6wVjlhqiGsYQj+cT4/nH101C
- mLCydJvqLVTreAAXIeeqrnHNOIL9dKKT9f4rXMd652NmSFRA7Hl6cQV70f2Bd/6r
- 5geLQ+flrJIpvhdXO40GtXOpf5VfX/BtQ3+3j4AZmEABEMCpo1mzO8Cp/d8adsnt
- iJTvp51OggSLWpJPt3foT0afuug1xCl6zP0uySXDaSaAuE/s+nCG0xiZLEs0HTib
- r3t9XXDIo2+gN4IULSn3XJIkXiR1L3BVu5M9UQIDAQABoz8wPTAcBgNVHREEFTAT
- ghFzc28ub25lc291cmNlLmNvbTAdBgNVHQ4EFgQUBf9CwdAc1mBKZS6BJMndqkOQ
- ccEwDQYJKoZIhvcNAQEFBQADggEBAHt0L5MxCaW+HF4r16kVr3GTAzjl/oQArntL
- gK5rSvzn5vBGOYwRqoOqOyT0KIg5x95mssw8DIonSOZKkBERkFcKdjW77vfaKWMM
- XbQyZQF9Udsf49yCac4/SEEDHqWVVB7uMngkx5FzU4dSwz+K7M9mlc1qpT0sYZc/
- sMZlncHSACTa9ClqnABgSRK5VxYAaqLflKFLDwR2pBVBZzX4GQ6iMkRLpfKYakHY
- 90CPLNchMKTaFTDS0LQkkQ+PqzE2OTlf8ov8ppzVLVN5ZLemuX9i9GNzLOoeW6dr
- XQgb23tk8eDNQABBWA7armXrmBXD1G1EQv6J+PqHowTqu2mI2qo=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.onesource.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.onesource.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.onesource.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.onesource.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.onesource.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.onesource.com/Shibboleth.sso/SAML/POST" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">9Star Research, Inc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">9Star: Global Business Intelligence</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.onesource.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Lee</SurName>
- <EmailAddress>mailto:simon@9starresearch.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andrew</GivenName>
- <SurName>Wells</SurName>
- <EmailAddress>mailto:andrew_wells@onesource.com</EmailAddress>
- </ContactPerson>
-</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 e19b11fb..99a527cd 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -14,52 +14,53 @@
<md:Extensions>
<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="sv">Åbo universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
<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:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
+ <ds:X509Certificate>MIIHPjCCBiagAwIBAgIQCIdeZB1qcIkU4tTDCYnlyjANBgkqhkiG9w0BAQsFADB1
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
-BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
-MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
-DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
-aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
-vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
-DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
-YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
-Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
-7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
-+9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
-kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
-by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
-b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
-MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
-cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
-ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
-AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
-AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
-AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
-AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
-ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
-AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
-BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
-AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
-QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
-A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
-m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
-nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
-njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
-5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
-8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
+d3cuZGlnaWNlcnQuY29tMTQwMgYDVQQDEytEaWdpQ2VydCBTSEEyIEV4dGVuZGVk
+IFZhbGlkYXRpb24gU2VydmVyIENBMB4XDTE1MDYwMjAwMDAwMFoXDTE3MDgzMDEy
+MDAwMFowgd0xHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYB
+BAGCNzwCAQMTAkZJMRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9w
+aXN0b25tYWtpMQ4wDAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcT
+D1R1cnVuIHlsaW9waXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRQwEgYD
+VQQLEwtJVC1wYWx2ZWx1dDETMBEGA1UEAxMKc3NvLnV0dS5maTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANb4brlN95dEcJsy174MaeKqJ3UEM1p0bu8v
+jjBYCypuGX8bP3el8iWcSP8lcxGRrmACcD5Ko0N9y/ESTw0LrI32HDLvqARQu924
+uEkfvNgzm8ZXjTUtsHx/X+PCsECazmRxBuFVrX/c7+zks2FPJ650RfKBJ1KRTB/D
+jH1BVgT1ZE7DE5E5agOdu7/AvMviNerzBU4Q/CkiR8dW4BoO9LiyY3LLALzqa7FU
+8QiDQiA7U/QuNoH1BTdaOaTg+/Bqe9M1043Tc+afnmeFMu3fU4wszBGsYvS8Olye
+RsjHHonGTsJkTSLsnqCkwe/EJ6kzR3FTyFe84mZVLkwzOPvZZ6sCAwEAAaOCA18w
+ggNbMB8GA1UdIwQYMBaAFD3TUKXWoK3u80pgCmXTIdT4+NYPMB0GA1UdDgQWBBQV
+aoLw/rzHI5GO/ai1+ORFk6KdpTAVBgNVHREEDjAMggpzc28udXR1LmZpMA4GA1Ud
+DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdQYDVR0f
+BG4wbDA0oDKgMIYuaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL3NoYTItZXYtc2Vy
+dmVyLWcxLmNybDA0oDKgMIYuaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NoYTIt
+ZXYtc2VydmVyLWcxLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwCATAqMCgGCCsG
+AQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMIGIBggrBgEFBQcB
+AQR8MHowJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBSBggr
+BgEFBQcwAoZGaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hB
+MkV4dGVuZGVkVmFsaWRhdGlvblNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMIIB
+fQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdgCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb
+37jjd80OyA3cEAAAAU2zMexDAAAEAwBHMEUCIQCyyjRA7KCuCu6cS5NORAEY49KK
+9w2Q0NJpfZN8CLUgEQIgUYRKKcnYBMEYarYAVLotMG2iRRALkz3WZZTwwP8mEnoA
+dgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAU2zMewxAAAEAwBH
+MEUCIQD0aqh3Oqdf3BzbagkkXKaeJBa7NTlsRMitc1xBeAe49QIgdpQ7gZ/LOjCE
+dagqUDlaPx1e+qLz7uRhKxEkNFguspEAdQBWFAaaL9fC7NP14b1Esj7HRna5vJkR
+XMDvlJhV1onQ3QAAAU2zMe2YAAAEAwBGMEQCIHQauPt4sfTw/bTB6pIPiprDNeBA
+nNhu1/MmUWKr7Hc3AiBGb0vB1w4FHHf1Ny4u55jIafaiwLYx9ljv4eLAV3TaxjAN
+BgkqhkiG9w0BAQsFAAOCAQEAZiTdMOkTfJ/xWOI7WhkhxKcrIEKRDJ8/YSNcKapW
+hBbgkusAkA8VmGXq3jfPHl91x1ei4UGhlfT5NT3VIcR42O/B7f3hX9YlWjsCd6ov
+b9UtpmzrTKwj8L/rSk1FyxpkY+FYdmI30LEk4I5D6qvFbP6PouCM4bdCU7Wzupv9
+yfh+syJZH6UmmHPrvElMtz1uXasR2UN+Vcj70T8siI8SG8MxTW3fTMw3s6EgF8nZ
+JlBClCkL32lcBnmiy96Y0afwQX28fKm0BxO8n86KkRcofaJEI3dC+/SMKnIIqzPf
+svl3XMWQ/VvQVSDEFjiZHOWDKJSxYtqL2mvzXRfEdY74Pw==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ba3ace56..00000000
--- a/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.ords.ox.ac.uk/shibboleth">
- <!--
- This is an "ORDS staging" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:09:15Z">
- <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://staging.ords.ox.ac.uk/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://staging.ords.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIJAKM+ZGZAkigcMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFXN0YWdpbmcub3Jkcy5veC5hYy51azAeFw0xNDA0MjMxMjAwMDhaFw0yNDA0
- MjAxMjAwMDhaMCAxHjAcBgNVBAMTFXN0YWdpbmcub3Jkcy5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPIzMJGiy26YXX/hbUenRMs6kvgB
- UNJfZ2QPHp1PIrFXA+vMlscS5YEy0kIqVPwtZz5+qJAHSqKlQOM5cg05gfAolGd3
- mDuKsRrQ68k2mv9O9XzBvREtdpBikdEq/l2dGcVg6TuN1yxR9D41tPR4KAcAFG75
- z/Ok+7wLq+iZn0WBi5moYSfHHL8m4tspB5u9+W9o+oqePg5Qq6ks1TRIXNTF5llq
- Sgd4KXxf2tErwQuGm9igjZdLpxWBgK1JRKbj2KCU2QHAjeJZwpByWEc1v/bji1nX
- 2pixxbTuqQM/E9oMk4u3j6mDBMfkYRfPonjDZpBdLIAKPqv1jPerEO7ejhUCAwEA
- AaNtMGswSgYDVR0RBEMwQYIVc3RhZ2luZy5vcmRzLm94LmFjLnVrhihodHRwczov
- L3N0YWdpbmcub3Jkcy5veC5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBS+sZ7C
- 5GuAQYsRxmwh+yjol3j1gjANBgkqhkiG9w0BAQUFAAOCAQEAWfln4ibbE5na1BfQ
- 7vF4MV+eai9uR86eyT5q+8+jKHcPV7Uj3xrbQCg67cq0MpqR8wyF9J0HpIvsJBVH
- D6KU4FpLI2j5Ewk1AB+axpsowB+5jb69bI/kpVBegyXMizEvABgTkeChtijEQUtb
- lCScLer3eDATqxIm0NsKhH2cGuLxuxUMm+4+Y2JEydhVgCQPscLGAHltvqKAEQKb
- R4qMEHpJDyr08tW/e33fKDXxJJYVoy2fXbLXvRj1b24EHWotph4ymU/yV2FosVvd
- On31/B5cEn9CioFOXIoI+idVlFcYjds3UL80ccdMvMZbuhAOrdSuiml0w68W908T
- 087V5g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford ORDS staging</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 39d13793..00000000
--- a/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.weblearn.ox.ac.uk/shibboleth">
- <!--
- This is a Weblearn Staging Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://staging.weblearn.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQDCCAiigAwIBAgIJAJX0ZKKX7ko1MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXN0YWdpbmcud2VibGVhcm4ub3guYWMudWswHhcNMTIwMTIwMTYyNDM2WhcN
- MjIwMTE3MTYyNDM2WjAkMSIwIAYDVQQDExlzdGFnaW5nLndlYmxlYXJuLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujPN4+nPhmPX7IHC
- DbKNREIMOegYbwxhS20EnBlNbePWKeWo/fRDsRITeV5aCBaEAUMPQ4pqm/WN7NOk
- LkFyFdgf88u9RDRvt8nsiBj8cVP1vGOa8Fd+WJALk+UdTHjDmoz8bERL+cEsD1UC
- FI/wUKmV9RfNGSEJFR0oDSddXI8Uy5DiFB0psDMY+b2CREqtSZcL8UZ5hXZHrBJn
- MwSlpO9R09eYWePrDpSmB+3N0kZ8knt/452y4d3tqBiLlei8eYBJYx4uyVrh2yDe
- TRXxFYf18C95X5alI6qQJ9LLtxUBG8H9dbqZNDZbDPUVZU43C9lyHZSNePL3nCey
- /XundQIDAQABo3UwczBSBgNVHREESzBJghlzdGFnaW5nLndlYmxlYXJuLm94LmFj
- LnVrhixodHRwczovL3N0YWdpbmcud2VibGVhcm4ub3guYWMudWsvc2hpYmJvbGV0
- aDAdBgNVHQ4EFgQUoB3xlJRX2I37Yt1m1afvUCGruzYwDQYJKoZIhvcNAQEFBQAD
- ggEBADSwA3sYHFxtdqLbm4mXlyYZV/imAfHxs2i4aXmyHYf5ygpKq6TyKxJlYj08
- SPhSO87l5IsUJFQvvS0gn0JD+KQmD4zKwlxQrHHsSyltttXZr6/iLrpntrl9DXaB
- 6dYes8fj/+2FCai7W4DtMHfCKnIbZjgnjcHP1iJP38/qHF1OS6WFksXHWOHCT2S4
- lsPet/+7viQNQBkHuxrb9h9hv4kbF+mLB8POpSkFi2qu8+YTwtU2LGOqYsOlcAc9
- GEMwiQOt0LOOhVndYBUZf0Rt8g/Xn12lm3tkOjpVeRLw0oTli4DedF9JtqVyzKat
- oWaY395NMNm9ZP2t/8TeydkoqYI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Weblearn Staging</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 37c53ca8..00000000
--- a/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://study.conted.ox.ac.uk/shibboleth-sp">
- <!--
- This is an "Award bearing course delivery site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-04T13:59:00Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmjCCA4KgAwIBAgIJAOLozXNL6LsnMA0GCSqGSIb3DQEBBQUAMIHNMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBVzdHVkeS5jb250
- ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
- eC5hYy51azAeFw0xNDA1MjAxMDQ4MDhaFw0yNDA1MTcxMDQ4MDhaMIHNMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBVzdHVkeS5jb250
- ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQoniFVDKEq
- 6jlQx2bHK9cCCT2T4n8J4X3cHDgOnvngHl/n97SaRBrqkIW9wmDudfV/y7nGCptK
- 6towZz+rM0RDmCfIu7VH57WhEpfB4iUqGjYCY44vVy8gDJdRWgXf7pqa/9B0yHzy
- ulyqOqlObv8YNz/fWgTnKQTCDiy6N4dVxWm1GElRv/grCQIzJ5tiWt9H11w8lyeZ
- 2kTFwbgJOGqAc6C9sJ7TXIycZef2oJaQ+Qf7oCD0BVyRy08yV5Xhhem6jWa+Zx7I
- s00cN61Co34QAzXHdUdA21myUBd4R5i1kjNIroqV/a5+5Oj8NWOsFAtcAPLqrpvO
- 0+rzGQXFCCsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
- blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFINOZtymmwrCBaQ6
- SBLdj5qEF+kPMB8GA1UdIwQYMBaAFINOZtymmwrCBaQ6SBLdj5qEF+kPMA0GCSqG
- SIb3DQEBBQUAA4IBAQAhqfovymE3xaeIHPF/rqOT0odVHG20bKu4UdGI+xj5RlcZ
- qhVwFiSgUU/fIK2wZ5vl3fCJEY1Jlq/okJfQhoDcGSWBlcXJ8Dy1LI7YzIPM9YYX
- vyQTAKR/iimGYuWXLRAyKFBMliLVH51EeGP0bh+02fEW20jqrxkRfrrlZNNsRaZ+
- gDRamuJk6cEQNIbH9vJ12gyng17kTfV9D5p+7mBBiBf4LAyZYBwpXFQcMR5MVlQX
- E5fLZIdP/chQFDreH6byJlD+8ZHWy+sQqhUSFRNBcgEATwuq9aNcXkzm/0CKOVaD
- 4o+kyplCfQiX41wflBJr2mENvIue2wY387e4q0t2
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://study.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://study.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Award bearing course delivery site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 120102d1..00000000
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">TERENA eScience Personal Certificate Service</mdui:DisplayName>
- <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate for eScience applications, such as grid use.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</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>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</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>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-escience-portal.terena.org/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://tcs-escience-portal.terena.org/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://tcs-escience-portal.terena.org/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://tcs-escience-portal.terena.org/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>UvT</md:GivenName>
- <md:SurName>LIS Unix</md:SurName>
- <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 04a96d49..00000000
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">TERENA Personal Certificate Service</mdui:DisplayName>
- <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</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>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</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>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-portal.terena.org/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://tcs-personal-portal.terena.org/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://tcs-personal-portal.terena.org/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://tcs-personal-portal.terena.org/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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>UvT</md:GivenName>
- <md:SurName>LIS Unix</md:SurName>
- <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 66f13c7f..00000000
--- a/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://teledir5.telecoms.ox.ac.uk/shibboleth-sp">
- <!--
- This is a "Test set up for Telecoms" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-17T14:58:04Z">
- <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://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRDCCAiygAwIBAgIJANX16FDnJfJzMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGnRlbGVkaXI1LnRlbGVjb21zLm94LmFjLnVrMB4XDTE0MTIxNjE2NTIwOFoX
- DTE3MTIxNTE2NTIwOFowJTEjMCEGA1UEAxMadGVsZWRpcjUudGVsZWNvbXMub3gu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyweHxHPmnhnso
- 8M2RhuEmAULqIBgAXMR93f47bFP7BcmBhfhDvo2MbODKFgiLvargURn1e/NJpU9E
- socaGCydVh/UfjanQ+BDv2OMC4TP+OkVpq3Ytj7OuNwS7XDJRH0DBF6ViuKeGLEI
- QJcwcpDsty6Nv02KtTqx6s7xDq5ZTw1bWu1YnpgJEfptRWeP/Fy27kTbCxuhSoGM
- i2AyhObTtip74KvLWrqdjnrDajmTyn3Q6NwJS78/WCZ9LhCDdEVDeFzh2Jmf7C8P
- D9CS8ngFr7vstIyprWjW6zRWJfAHqZAl1q1BJqyapClxHcY+vaU+RGgg3rGOCmIZ
- R6JJ4xpHAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnRlbGVkaXI1LnRlbGVjb21zLm94
- LmFjLnVrhi1odHRwczovL3RlbGVkaXI1LnRlbGVjb21zLm94LmFjLnVrL3NoaWJi
- b2xldGgwHQYDVR0OBBYEFK8xAUsfV8iIepwmYhTalg2LmDkjMA0GCSqGSIb3DQEB
- BQUAA4IBAQAbSeWfz3/JHz+K8QDFZ/hAXlSfhsZ8cLNRvAyngacjrShnNjt5FYYY
- 3NuRQNrqahhlVIeWWRVzQyEFAyeyjw6joZThkuFCFC80GobXltQynj74qquWn4xy
- pEplFFeaZRm342BkjifrVHKKW2UQiYkvj3ZCpNqZaaMk2zJCRa279xR/NCst1OP1
- gCyW8S6Qdj9uYRynfTwCiWupd0+MTueEXBkk4lT5/Xssy9WuWGV35FgIjGnGDw0J
- dzxX0lnHhv9sM9OH0gWwl57wJlZjwzRDmZE7QmPpnD/Q1r3NzNFVfrfABjKuAZ8F
- ZBxxFc3M3ZaEb+h0oQ8fK2f1XPDlw29j
- </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://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Test set up for Telecoms</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/telecoms/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Telecoms IT Support</GivenName>
- <EmailAddress>mailto:telecomsitsupport@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Telecoms IT Support</GivenName>
- <EmailAddress>mailto:telecomsitsupport@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
index 83bfe7ae..277ebc74 100644
--- a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
@@ -87,4 +87,9 @@
<GivenName>Dev Team</GivenName>
<EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Phil</GivenName>
+ <SurName>Amyotte</SurName>
+ <EmailAddress>mailto:phil@cloudspringtech.com</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
index c9e176f8..94bd21c9 100644
--- a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
@@ -44,9 +44,9 @@
<OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Mohammad</GivenName>
- <SurName>Nawab</SurName>
- <EmailAddress>mailto:m.nawab@nature.com</EmailAddress>
+ <GivenName>Chike</GivenName>
+ <SurName>Abia</SurName>
+ <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<GivenName>John</GivenName>
@@ -54,9 +54,9 @@
<EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Mohammad</GivenName>
- <SurName>Nawab</SurName>
- <EmailAddress>mailto:m.nawab@nature.com</EmailAddress>
+ <GivenName>Chike</GivenName>
+ <SurName>Abia</SurName>
+ <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>John</GivenName>
diff --git a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml b/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml
deleted file mode 100644
index a64f9cdf..00000000
--- a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-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://testpbyp.camb-ed.com/SP/Shibboleth">
- <!--
- This is a "Personalisation by Pieces" Shibboleth SP for Cambridge Education Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://testpbyp.camb-ed.com/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
- to teaching and learning developed by Cambridge Education in 2006. It is a
- framework to support personalised learning based on core skills and competencies.</mdui:Description>
- <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-logo.gif</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAJ0gsyZA9LuWMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGm50ZGQzMDk3LXZtMDEuY2FtYmJlLmxvY2FsMB4XDTExMTAxOTA5NDc0NloX
- DTIxMTAxNjA5NDc0NlowJTEjMCEGA1UEAxMabnRkZDMwOTctdm0wMS5jYW1iYmUu
- bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCh5Q5Pfp0V1Ch6
- BGzR3BdI5zG2iuEFSIXL86J8BjNtmXK7trhlmkFV8IRrSlZZT4HoQ5L8osWMmjvF
- PT7QUShEgOa2whBn40B8FKCLgEpBw5cigexoc5CSsrwrlYFRvyI5dPFxWswcx+xJ
- ZY8Rrzr2nWyt3uFzs2wNwIx/ftXQPLXQPVRU14OQQa34oy8EY8Gu+IcZJKbLUssz
- 3jFc/7RYXXE6GT6gU1zuIVTXl3C/rZniD2byTkw6cT9p0PqnAjt75A2tjd4Caro6
- 8wyof9P7NjtHaRAl1lY/FH0OFPuSoF4FJxFgzeY/iQ59qxZ0hpVx0/ypy35bkrIB
- 9sYRChKPAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDk3LXZtMDEuY2FtYmJl
- LmxvY2FsMB0GA1UdDgQWBBQIox4FW13pfw8o8eGdT9Pf62b05TANBgkqhkiG9w0B
- AQUFAAOCAQEAHZ1hImDls+f1zizRgGQVAi3oDJxKIbsZpabHWiF26ZLm510Scw0m
- EMo+ujL+QZGZGrm8EFvRg3SXRgn1R7FogYof7rg8xegReDSpKLsnGJFiKj+CBq8w
- bFZ1A4jfGD1BITLqn1RpFqrFAXHI5O+LbZSMf4LxC/y7h8H/oa86qKAyBQ/6VrGQ
- xKt+6n+Wf8hbkI2xcBzfzr5RiRWynCDl7uBLZtgqVnqWm+kMSZ7pumsCoQVnIiUg
- UY4Kot4hlc38yuDomldi17E41LhqZqi/ZOUi2o2l9r7kyGKDd5LCmXNiQdsGtfWb
- 7xE8KO+hyTvS+CzJoArDBNyd7hkQJqw3gw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cambridge Education Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cambridge Education Limited: Personalisation by Pieces</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.camb-ed.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Bell</SurName>
- <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Zishan</GivenName>
- <SurName>Sheikh</SurName>
- <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>Bell</SurName>
- <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Zishan</GivenName>
- <SurName>Sheikh</SurName>
- <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 56d61487..00000000
--- a/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testx.rewley.ox.ac.uk/shibboleth-sp">
- <!--
- This is a "Continuing Education main test site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-26T09:39:37Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmjCCA4KgAwIBAgIJAN3lX0bKmvYOMA0GCSqGSIb3DQEBBQUAMIHNMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBV0ZXN0eC5yZXds
- ZXkub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
- eC5hYy51azAeFw0xNDA1MTYxMzUwNDZaFw0yNDA1MTMxMzUwNDZaMIHNMQswCQYD
- VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
- MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
- bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBV0ZXN0eC5yZXds
- ZXkub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGlJIa2jDp7
- 2G0veO3PKZIeR5bEjwiIwMJ2eVLavYR8srwBfAJKqWfLSTkHpwqTDiV4TJzW1ZLX
- DSA45CE21tx/hEb4u0vEARvRpNE1v+0852wV8MTWAIG32D3ciIOhNwH/6FInVbVR
- iLRyjWoykWTvZoSdu6mQa5fTXq5CzUhMg3FDfT4Z6piyAdJMz9NUF8vr2chS6VLg
- tWwC20/gerQ4TN81X1NZBZcdHQG1c9rvg7IR28CjfVggUvDkbsqaWYmf5ynO7328
- l8LJxtzvWRxJu6XyiPE5wr8ISdtjYpXczE+2rzkIEo8ztJI9dx9X3bkq1QvJIWHP
- uEeykQijZd0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
- blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJIfR/ZYmJByuaE5
- GldU6Q5Ti+4ZMB8GA1UdIwQYMBaAFJIfR/ZYmJByuaE5GldU6Q5Ti+4ZMA0GCSqG
- SIb3DQEBBQUAA4IBAQACMlLHR3DfGj7btTxywdzVVxjVZPmwsbuBRUXx+2+BM6eJ
- oRMnlavU7APk7/1WO39MXA94fsCUZqzS5J6zTH4M+Zz80yav2/6ovZ3hCLi7f95A
- 4EJYyZDhEoUj18ghVsx27DzvGvHT7iot93IyQl+TC5uzfaZewZKmdDjuFXnZyLE6
- 63zwkMgxdQZpNx3bBXnnQijmXKd9D0kDAn3QdzHWWAzLNIiElhkPtWOfyrr96d+E
- Za3sWCoe1p7/z6S7QFrkaEIPoQUmWADygNzOdGEMR2oUtbX4FUMaKj6lJ0yn7x/D
- kkjAFsFqiMDHkphikIOe1+UNnWIECZVMWqntNn7b
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Oxford University: Continuing Education main test site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mike</GivenName>
- <SurName>Taylor</SurName>
- <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 55755290..00000000
--- a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://timetable.earth.ox.ac.uk/shibboleth-sp">
- <!--
- This is a Timetable Service Shibboleth 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://timetable.earth.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOsQvmtCqbDkMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51azAeFw0xMTAxMDYxNjU0MThaFw0y
- MTAxMDMxNjU0MThaMCMxITAfBgNVBAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANNEwMterh/GkNFeH1Ox
- jatg+8pug6Pr2Vyiu2+MLGUvpvhOA+4aHvxCYHTDR2yzWEwHkRILS3yA/B+QiW1y
- jE4Wg259kMHXskPDdU+62T+tySdj5Hobx05oKGx1PxYy/d2KFzyLe5wfXdmWKrM3
- dJHgrYIyY5bEOU5CpieAJJ/+Exfchmefht/NfRKV0bkkejvUg+IpdPwm9tSo7z5O
- My+TYahe3/c5/KroVkcfDuoM1ACCRDsEI2NgBCCtVOYrfJN5F3+aVx58YVoOjC4n
- 4rbjfJDZs0VVJ3Up3B0OGsxAAIoCO8YUfoO50vjvhloqrIYFVLslV2iG0Gm817y3
- 6D0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGltZXRhYmxlLmVhcnRoLm94LmFjLnVr
- MB0GA1UdDgQWBBTG32OU9vtJWEvtMFERCWhc08NbJDANBgkqhkiG9w0BAQUFAAOC
- AQEAzhSe/ubjNqjFP9MC5k4Fgu24Eqz2WyoiotA8dd2MKepsf0fEHxy6kB/E/lVO
- aVvdYkRKINYmPbTeN/ylPEBwSVeN71OLBZ19fvMpB6J6lozKUNv+PrwfekSyUeCs
- 5j/pVm+vwWM4onyEUeWkTFmtXaj1tcWGfLSYtX1evbGskPMcReYNFTRKIOzRE0dS
- KSF/1lKbLyDdcLr2P3aDc8DQYNK9WBiUuMmbN7w9RXp7pv5ZWefRYYVSVM2j6ccF
- I2JAPf46KCAYCHz0xVbT9I0pJ3kqsy9OCiQfK0zbSCS+3xV4VALStOm8BiY/wDVm
- /M5ANmyQkgK/JxOjRvUm4lHFeA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Timetable Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Will</GivenName>
- <SurName>Hanrott</SurName>
- <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Will</GivenName>
- <SurName>Hanrott</SurName>
- <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index e8badcd8..00000000
--- a/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://timetable2.earth.ox.ac.uk/shibboleth-sp">
- <!--
- This is a test Timetable Service Shibboleth 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://timetable2.earth.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAIt5f6RWOLqKMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXRpbWV0YWJsZTIuZWFydGgub3guYWMudWswHhcNMTIwMjA3MTYwODQ3WhcN
- MjIwMjA0MTYwODQ3WjAkMSIwIAYDVQQDExl0aW1ldGFibGUyLmVhcnRoLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVDJbATimnosBA7H
- 2bLDXbABcMxjl2JwjC11jxEtzzJZxMRf+Hy0L8onaK9XuLyGt0nqE1X0phVKiPXB
- 9yaZ27WCZYGa41PUYIbF6OLCzuCN73KGRy13tcIyiTjot4Bct3ixjaUze478MIHY
- 7cem/cIlIlw0qXmKHvhMcjr6hamLZX5r+WMp3+1N/7RQ5NrKZJ0qkKapKtnCQ0l/
- dlhtsSISuxKpWQ6XJR5JTsrkdHUsfSbL7i+KTKfoS9XOpJZS2+S0yaeKaD/lT07M
- yaaCzZCQhs1Rv1FYJOow62S2DeQpQGMNxCVca4BWxVbH7ACXnApVeVkuFfonQkz5
- SOGJ1QIDAQABo0cwRTAkBgNVHREEHTAbghl0aW1ldGFibGUyLmVhcnRoLm94LmFj
- LnVrMB0GA1UdDgQWBBT/Ae0zEanWYNZV9FQg/TGuXx8rLjANBgkqhkiG9w0BAQUF
- AAOCAQEAPmCO0Vc7Z6wGpKj77kUjoV8rJHz02as0f1JJxM/wV4dsyNY3KDYuUiQt
- fwWCC5GZtGxxtrTpu5OJYXm1YnfF/Zqdw+IQEuJR7ygSZqZkpuN62jr4GghM3fTW
- UG6oj/WaicSHb8xnXdNcPdAZw5u2oOaGDFicC67OYdnQpJZq5ELysDrHIDi0fhNL
- mf72wR0yuR5fwKs2rC4b9PQmeJm2uE+Zq4tCHEfjG8rv6/Pw95uZSbFcA7OUVyCZ
- EC5oy39+ZN5oMHwTu3h+Hg28mpBpIHj4EejKL1GatXCiEYcOiLGSKK0X+fmzBbGk
- /1fpdjYY8WLnlR3GF1QjWUraVSirjg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Timetable Service (test)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Will</GivenName>
- <SurName>Hanrott</SurName>
- <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Will</GivenName>
- <SurName>Hanrott</SurName>
- <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index daf26dd6..00000000
--- a/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topdesk-training.test.bath.ac.uk/shibboleth">
- <!--
- This is a "TopDesk (training)" Shibboleth SP for the University of Bath.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-23T14:21:31Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
- <mdui:DisplayName xml:lang="en">University of Bath: TopDesk (training)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Service provider for TopDesk (training) at the University of Bath</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
- MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
- yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
- F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
- AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
- 1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
- yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
- k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
- LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
- AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
- lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
- 0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
- NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
- KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
- qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Bath</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Bath: TopDesk (training)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://topdesk-training.test.bath.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Webmaster</GivenName>
- <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Phillips</SurName>
- <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index fee0d6ff..00000000
--- a/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topdesk.bath.ac.uk/shibboleth">
- <!--
- This is a "Topdesk" Shibboleth SP for the University of Bath.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-25T10:10:19Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Bath: TopDesk</mdui:DisplayName>
- <mdui:Description xml:lang="en">TopDesk Service Desk Service Management facility for problem submission and support</mdui:Description>
- <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
- MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
- yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
- F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
- AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
- 1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
- yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
- k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
- LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
- AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
- lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
- 0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
- NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
- KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
- qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Bath</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Bath: TopDesk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://topdesk.bath.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Webmaster</GivenName>
- <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Phillips</SurName>
- <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index d17b56c2..00000000
--- a/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topdesk.test.bath.ac.uk/shibboleth">
- <!--
- This is a "TopDesk" Test Shibboleth SP for the University of Bath.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T12:51:32Z">
- <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://topdesk.test.bath.ac.uk/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Bath: TopDesk</mdui:DisplayName>
- <mdui:Description xml:lang="en">TopDesk Service Desk Service Management facility for problem submission and support</mdui:Description>
- <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
- MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
- yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
- F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
- AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
- 1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
- yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
- k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
- LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
- AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
- lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
- 0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
- NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
- KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
- qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Bath</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Bath: TopDesk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://topdesk.test.bath.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Webmaster</GivenName>
- <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Phillips</SurName>
- <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 63cbc3be..00000000
--- a/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topup.chch.ox.ac.uk/shibboleth">
- <!--
- This is a "Christ Church College Meal Booking System" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-08T15:01:25Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOgjayHP9ZbqMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGFzbWVhbHMuY2hjaGxhbi5veC5hYy51azAeFw0xNTAxMDcxMDAwMzFaFw0y
- NTAxMDQxMDAwMzFaMCMxITAfBgNVBAMTGGFzbWVhbHMuY2hjaGxhbi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANULnFykGUp7Gti10dcY
- zKK5yeuxhTBxHfbr5nU/kIAouD5tqfottb6f2jfQRPXmmnLhx7jNzqzDQzvngZ1M
- ZsfduI3IVItK4C6Emk5ddICmJXNWjMlidecTg8cWZpvb17FTdEUaHEdHXRFP6bdJ
- n+oz0opigSuiBars6m8vxrw4uFaOPs3vKYzB5ac+COwQb5QjSBF6lhDG6IRvbAIh
- 7O+SYCOOTai7NAO5Hq4o7K6eRBizPQS/vInf+VPGX5NJXCACEjoXqsmxccm39Vfl
- iofR6AOuwMcz7p0eGZYNgIWFohvRbRYF+PIY5Z3TLztK6wIzdn5UUQ+gtaejE16n
- 4mECAwEAAaNGMEQwIwYDVR0RBBwwGoIYYXNtZWFscy5jaGNobGFuLm94LmFjLnVr
- MB0GA1UdDgQWBBRX0XxbsGyStcfpI1hR45KbWnfLLDANBgkqhkiG9w0BAQUFAAOC
- AQEAVyfnZcfyh0wsGNQ9wnfflXfMsonJhECpnmT+8T7Lf/SPoPDtngnMuLA/xGIr
- V8JCX+fO+uMnNlQjplb+VdLlNuI1w1/8gj4iw1osSxuDNaFX0Adaj6gsvEz2KLVt
- j7OYdUoz+4QXoUNIfQ50P7Duc+No6/zmMIB9waCv3h/p6OLuMVQxJcMILMBGDl4z
- p3Rvub4/tSm9TQrhcRfSD0Q2l+V7oErCOURmKkW+m3s0WTAdKUq2if3+lt7EeY38
- SiU31D5xFUn5dIWaQYGhRkMJXZUEZeQvyRh4Tccj7KvZp6ukijIrPK3FPrvc6NoQ
- PLpKazbWprz6PaLBp/jrAHGCLw==
- </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://topup.chch.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Christ Church College Meal Booking System</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.chch.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mike</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:support@chch.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mike</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:support@chch.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 447b63c1..00000000
--- a/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.staffsubs.ox.ac.uk/shibboleth">
- <!--
- This is a "UAT Staff Subscriptions Site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-02T11:42:23Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAIqBFTxbOzVpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnVhdC5zdGFmZnN1YnMub3guYWMudWswHhcNMTQxMDAxMTI1OTE1WhcNMjQw
- OTI4MTI1OTE1WjAhMR8wHQYDVQQDExZ1YXQuc3RhZmZzdWJzLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwiFfqsi+5atFOA+H2AGWJOkv
- NP1h4W9LZMgyfC5BRBpRe+LTKuUOBgGnE0aELcDP2Sfko51AS4lNGOPO95ttYL/x
- Mt01AeDnbZy++mzNpdok3GkGrn3TFy3pWiambJBU6gLTAif1xZwVFTYj/qkJy2d2
- Kt6OE+D5zQgQYfIjhZTBM2+aQDHkt1wCdhGntHKenE1PqwFjM1wbIcKRfJuEYfTb
- NiT/SCKJyIY8pMzGSGUOIWBiITwOo/74eVa16qEbjSLrOzh/3Ng2XSkJiBH89vx/
- UYT9cfkiPhjlE+JmDIFHfaJR2eqitOpTD9fKt4Y46016CaKDSDeZjJXyQT22KwID
- AQABo0QwQjAhBgNVHREEGjAYghZ1YXQuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
- DgQWBBQzimnzRTqL34ndNzsV9V2iNg6aNDANBgkqhkiG9w0BAQUFAAOCAQEAEKtE
- guYI0ex37725s2GK7PzkqfbT91/Av/k97Z4+iGtYGBa0B7aL/p+Sw1PwgKnUqvw5
- OOGswJOjFHdKUiwomyeedA/1ojlVZou1N/C86YSSr1YlbruOlRm90QIOulZVDMi3
- IVaUamwWpie1+Nyas1X9pnKs/wn18YJYVEJmlG0oVh/9foZm7ph3Z5J7bkA9mV+R
- HvrOoKZS5yUUfE03fYP/931Zv6/POl8Srljh+yBUpbEZXdQma0mrvPK+V5p1ugUL
- Ay6LEowEY7LJXL5GFymbbohOZTDT/TEDZQxZd+gsi58/r2YixRwtO87tnOJdUEvw
- 21204RAvyjBXtPAIiA==
- </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://uat.staffsubs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford UAT Staff Subscriptions Site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ops Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
index d213b2b1..0602fa48 100644
--- a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
@@ -77,13 +77,13 @@
<OrganizationURL xml:lang="en">http://www.oshens.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Steve</GivenName>
- <SurName>Westwood</SurName>
- <EmailAddress>mailto:stevew@optimadiagnostics.com</EmailAddress>
+ <GivenName>Simon</GivenName>
+ <SurName>Layton</SurName>
+ <EmailAddress>mailto:Simonl@optimadiagnostics.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Steve</GivenName>
- <SurName>Westwood</SurName>
- <EmailAddress>mailto:stevew@optimadiagnostics.com</EmailAddress>
+ <GivenName>Simon</GivenName>
+ <SurName>Layton</SurName>
+ <EmailAddress>mailto:Simonl@optimadiagnostics.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml b/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
index 0c69fc50..45bc17e4 100644
--- a/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucl.epiclearninggroup.com/shibboleth">
<!--
- This is a Shibboleth SP for Epic Performance Improvement Limited.
+ This is an "ExtendUCL" Shibboleth SP for Epic Performance Improvement Limited.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -82,8 +82,8 @@
<EmailAddress>mailto:ABannister@epiclearninggroup.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>René</GivenName>
- <SurName>Soltermann</SurName>
- <EmailAddress>mailto:RSoltermann@epiclearninggroup.com</EmailAddress>
+ <GivenName>Steve</GivenName>
+ <SurName>Avey</SurName>
+ <EmailAddress>mailto:steve.avey@leolearning.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index ed6a6423..00000000
--- a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukaf.it-innovation.soton.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for the University of Southampton.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T15:30:07Z"/>
- </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://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</mdui:DisplayName>
- <mdui:Description xml:lang="en">Enables UK Access Management federation members to access GENESI-DEC repositories</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDVDCCAjygAwIBAgIJAL06GKgIw781MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
- BAMTHnVrYWYuaXQtaW5ub3ZhdGlvbi5zb3Rvbi5hYy51azAeFw0xMjAyMjMxNDU5
- MzVaFw0yMjAyMjAxNDU5MzVaMCkxJzAlBgNVBAMTHnVrYWYuaXQtaW5ub3ZhdGlv
- bi5zb3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsh
- 7nb5qjRPVhJKl7d7HtTfVbmWSMq1NPzDzYyTMAOg0+VcmDFvu5ICIp0w2w07QzGv
- 3ryZp2TaT+9DNyYaeVfnSB5rPPAuHLHrXvTwszgfXH6Bq88fkBLEHR7xIMPNqNFG
- 9JHf6VY3Z6HwRhX2wJt34O6IO7q1AuMsgmSR8vLD6ftHX7VzSXkS305cA1zNN1vD
- xnV8Zp8ZyNE3F5xVCZBVs7XK9futaxSL8GJfX8l0IzBFeezXh9BmN5p0/2KDtwmw
- YsBinxXAIwBCUVctfuMpnM3p9ZHRTfR4hbkDwpbTXxwEmajDXnyrbdNK/zEuGhOW
- 4+m38wiymTEmMQaPys0CAwEAAaN/MH0wXAYDVR0RBFUwU4IedWthZi5pdC1pbm5v
- dmF0aW9uLnNvdG9uLmFjLnVrhjFodHRwczovL3VrYWYuaXQtaW5ub3ZhdGlvbi5z
- b3Rvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBTAs5xK22h/EZSU8IMQeGKQ
- mYg4YjANBgkqhkiG9w0BAQUFAAOCAQEAxm8quSodKR3OSqZKQyv48Nw4ztkOgoIq
- iRT/SNCtGIsIxRLE/wh6VD92ini8KLXyjY+9vnySiIz7EmPU8noS67XRkfMss33Y
- gB0uKN4jwo7wQw0oWzd7YuPjWBfWVgHElvtITjpJ/NR5MCk2A4w2kKjvCd70e+Ut
- O8Uiewnm0VArTVusZ1IZtT3P+5Yp4Hiq5+sjtRbxhTQn/cAkl57CemlBrj6jsPT2
- uH0taQOxowajF5t/STCwIlCRBNptPlAMFB0x6AB2Oq2dNjzLhq8VnpSAZ6+EwSuo
- 3nkLy6HSlY8Nka9tIZollWJv0yu6+6BHzf/KMzryiGaxpKjMtB+Caw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Southampton</OrganizationName>
- <OrganizationDisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it-innovation.soton.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Help Desk</GivenName>
- <EmailAddress>mailto:support@it-innovation.soton.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Web Master</GivenName>
- <EmailAddress>mailto:webmaster@it-innovation.soton.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 95149c3b..00000000
--- a/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://upkdev.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shib 2 SP for the University of Oxford - UPKDEV Oracle Training Environment
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://upkdev.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAM3SwyRR3bgIMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFWJzcHdpbjI2LmJzcC5veC5hYy51azAeFw0xMTEyMDUxNjAwNDJaFw0yMTEy
- MDIxNjAwNDJaMCAxHjAcBgNVBAMTFWJzcHdpbjI2LmJzcC5veC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjqdqsgyd/uQ08OxSRl4gAwYPFm
- pgRRhOmjO2Om4ZWmRNawAngO6J3BFrSRQcIFXU18WS7gdKdgN1E5dLlujDjKsN/e
- kPC5UJiPpMELAdiwrFMcQQGnPE53jI8Xj/HOTG3n66xRmrr3cuRRAE708i5NxShQ
- uL2HDO0jZB8Er/Ie3Sp2Nzjzpcx5yHgb1yVd/UxOkKoR/QIafT7PUko2AcELvA44
- shUthRUiSybsA9X8b6Ri3b+ewLRPUoDD1Th4zcG8D9KNL+ED8RsP9hwtZHrDXHwi
- nnzYotblpAZOspxym6G+RUvSvx7s5mrXF8oAhQmluAAtEj/I3su8VgIw5g8CAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVYnNwd2luMjYuYnNwLm94LmFjLnVrMB0GA1UdDgQW
- BBSTMLysVwykBrWtSKkiTJUDM/CzmjANBgkqhkiG9w0BAQUFAAOCAQEAhlmJteoW
- GZ4iVYnltbjOne5bqHZSrv5q5bdPtjo1PsPxEqHE1+hUlbTbEot6T1ponxu8vpyi
- vqDzSWq68O2uIq2Qa2qA1srl66tFYlJnrRIuPhH0qW9xk+eI23+SRzoiKl9PaVjJ
- y1R1pKQG/WHaYFY7/UsLjDJjmqbk1qxWhl+4VaeOPCn35u/cA3qX2Amdk3RSRb+c
- 9GfwhbvtzlMBI3qA9frsr31AYBlKYxWh/rKVxAWzrle8GNYr2V2OJ17y5MdvTfVx
- jAyhlvp7Bap+Lkn6LWNJ/LBpg90XSMC0mFuT88LXgA9LllTUR8EQeZpSDI3iC5HY
- O0S/azG5O+MD0A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: UPKDEV Oracle Training Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Stephan</GivenName>
- <SurName>Eckweiler</SurName>
- <EmailAddress>mailto:stephan.eckweiler@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
deleted file mode 100644
index 3c1dad55..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:ens-lsh.fr">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T13:13:51Z">
- <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">ens-lsh.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">ENS Lettres et Sciences humaines</mdui:DisplayName>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAJElEQVQY02NgwAD/UQBZAv//YygBCjIgUbhUgHWTrYIMp6MBAJJ9q1VeWKzLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjM2KzAyOjAw1qWb0QAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozNiswMjowMKf4I20AAAAASUVORK5CYII=</mdui:Logo>
- <mdui:InformationURL xml:lang="fr">http://www.ens-lsh.fr</mdui:InformationURL>
- <mdui:DisplayName xml:lang="fr">ENS Lettres et Sciences humaines</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>
- MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
-ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
-cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
-mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
-sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
-byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
-qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
-FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
-ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
-c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
-BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
-vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
-aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
-AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
-ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
-beyt/O7UlYCwegLabizFFtOY7ztDocU=
- </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://shibboleth2.ens-lsh.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ens-lsh.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">ens-lsh.fr</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
-ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
-cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
-mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
-sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
-byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
-qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
-FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
-ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
-c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
-BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
-vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
-aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
-AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
-ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
-beyt/O7UlYCwegLabizFFtOY7ztDocU=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ens-lsh.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">ENS Lettres et Sciences humaines</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">ENS Lettres et Sciences humaines</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ens-lsh.fr</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Christophe Girard</md:SurName>
- <md:EmailAddress>Christophe.Girard@ens-lsh.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Christelle Chaput</md:SurName>
- <md:EmailAddress>Christelle.Chaput@ens-lsh.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml
deleted file mode 100644
index 96ad2f80..00000000
--- a/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vote.kcl.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 SP for Membership Solutions Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vote.kcl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
- MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
- 6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
- hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
- MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
- aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
- Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
- HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
- daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
- FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
- wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
- 4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
- rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
- eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
- </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>
- MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
- MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
- 6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
- hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
- MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
- aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
- Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
- HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
- daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
- FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
- wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
- 4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
- rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
- eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Kings College London Voting</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://vote.kcl.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Bonsall</SurName>
- <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Bonsall</SurName>
- <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml
deleted file mode 100644
index 0c902a5e..00000000
--- a/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wakeonlan.liv.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for the University of Liverpool.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-08T16:17:00Z">
- <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">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDbDCCAlQCCQCrskmXeYbk3DANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
- QjEQMA4GA1UECBMHRW5nbGFuZDETMBEGA1UEBxMKTWVyc2V5c2lkZTEkMCIGA1UE
- ChMbVGhlIFVuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMRwwGgYDVQQDExN3YWtlb25s
- YW4ubGl2LmFjLnVrMB4XDTExMDIwMTExMzkyNFoXDTIxMDEyOTExMzkyNFoweDEL
- MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNp
- ZGUxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEcMBoGA1UE
- AxMTd2FrZW9ubGFuLmxpdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBANqAaYk6iHP6srXSIiRIFL1uRJwfMI75m1gr+F4dcIhQLpB4VSRkLmik
- Z4XDuKncuEZHDQjSxm108N/GAjFQkxQ5YiU/0ASBnUY4DfuReR9/6EbCyKWsLuAv
- WO3xpJumK7llnspfNVG74r0vPYuAlyqPpKFXjBUOnm+S7EcF8ccXGN4EzUO3+qWJ
- kmzt0O8WZKJky6Qe2Glny+pvPXBniqENbzbDKh3IvJmW1ImKTET92gxXXLGC/bXX
- 0uIoTP/rTdQ9Y82mcBY6JWXpT5Ne89yOdkXmFfUUv2rTOSwDiikNuPxWrg32Xco1
- mMh9A4NBDByYWjIh96/L+JQqUDNg6v8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- KPJV9rQe79wsTDtRFpj1QiH6zT0uR/igAUmZfal8ejsPIMGGEGL5Uz0ZPqKKPXg8
- uk0+fPBNLmlVqkWuZkEMFDN+JFnWxoBoXdbNQvW+LrtiSEYhh+hpn5n8k2l4XpSM
- 3AuZSP7nYAYzK2xQIECyNcfL+yQfZhdqzrSeuWh/PxUG5MHnQWyAlT9K+UXXiMUN
- EIg5bTg1h2IIuyBWW6whf+jt2kJSSmX03E5oXB38tWC0/AV/xyuGev9BpWAAurps
- Jx+MWwjd0O/ssDH8XhVwUE88bPDscP+4AUrDQ5dfVv7NWVcp9msiKCeh7oQT5HOK
- 8QUvTzj/aD2BLORCajWMtQ==
- </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>
- MIIDbDCCAlQCCQCrskmXeYbk3DANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
- QjEQMA4GA1UECBMHRW5nbGFuZDETMBEGA1UEBxMKTWVyc2V5c2lkZTEkMCIGA1UE
- ChMbVGhlIFVuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMRwwGgYDVQQDExN3YWtlb25s
- YW4ubGl2LmFjLnVrMB4XDTExMDIwMTExMzkyNFoXDTIxMDEyOTExMzkyNFoweDEL
- MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNp
- ZGUxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEcMBoGA1UE
- AxMTd2FrZW9ubGFuLmxpdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBANqAaYk6iHP6srXSIiRIFL1uRJwfMI75m1gr+F4dcIhQLpB4VSRkLmik
- Z4XDuKncuEZHDQjSxm108N/GAjFQkxQ5YiU/0ASBnUY4DfuReR9/6EbCyKWsLuAv
- WO3xpJumK7llnspfNVG74r0vPYuAlyqPpKFXjBUOnm+S7EcF8ccXGN4EzUO3+qWJ
- kmzt0O8WZKJky6Qe2Glny+pvPXBniqENbzbDKh3IvJmW1ImKTET92gxXXLGC/bXX
- 0uIoTP/rTdQ9Y82mcBY6JWXpT5Ne89yOdkXmFfUUv2rTOSwDiikNuPxWrg32Xco1
- mMh9A4NBDByYWjIh96/L+JQqUDNg6v8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- KPJV9rQe79wsTDtRFpj1QiH6zT0uR/igAUmZfal8ejsPIMGGEGL5Uz0ZPqKKPXg8
- uk0+fPBNLmlVqkWuZkEMFDN+JFnWxoBoXdbNQvW+LrtiSEYhh+hpn5n8k2l4XpSM
- 3AuZSP7nYAYzK2xQIECyNcfL+yQfZhdqzrSeuWh/PxUG5MHnQWyAlT9K+UXXiMUN
- EIg5bTg1h2IIuyBWW6whf+jt2kJSSmX03E5oXB38tWC0/AV/xyuGev9BpWAAurps
- Jx+MWwjd0O/ssDH8XhVwUE88bPDscP+4AUrDQ5dfVv7NWVcp9msiKCeh7oQT5HOK
- 8QUvTzj/aD2BLORCajWMtQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Liverpool</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Liverpool: Wake On Lan</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.liv.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Web Team</GivenName>
- <EmailAddress>mailto:webmaster@liv.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Web Team</GivenName>
- <EmailAddress>mailto:webmaster@liv.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 6a36330a..0f08d64a 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -91,6 +91,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smk.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msk.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drcmr.dk</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simac.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5e512d59..00000000
--- a/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://web.chorus.ox.ac.uk/shibboleth">
- <!--
- This is a "Chorus Service" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-17T12:19:54Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJALFL+iOr5QKwMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCHVuc3NvcHMxMB4XDTE0MDkxOTE1MzAxM1oXDTI0MDkxNjE1MzAxM1owEzER
- MA8GA1UEAxMIdW5zc29wczEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQC9jXikIGweeUQMxRFMd2cQHoFDStW8pj5E5dwQvkTiyBRy70CYGgNKil8fGPZM
- 54PHToqXCBKv310cC4RhnSKSbLi+zXduSEzf0GLcsI6mXV+BPzlPuZsZSlIulIEo
- 8DPyLrJT8Z9tNa1Oi33Jo/Rc53OF0up3e6XBBNh78jQEjiTo82PcSecgi9Bg/4yl
- d7hFdPOKWc34EMi0V2mHLRqiL9V5YSSbfTVxJ3I/35/X9Bzo3a+47a86fhxJ9kh3
- W2/T6wHMvjYJnGmblhN7MmvVefhHWNIA4F9DVUCQoHed/nU56kY2HIULt/eIxD0s
- oLkKg9nTYs7qrW9/u3OTEyC3AgMBAAGjNjA0MBMGA1UdEQQMMAqCCHVuc3NvcHMx
- MB0GA1UdDgQWBBSBQh+JSuz8W3Jxuk3CYYSenJCR2DANBgkqhkiG9w0BAQUFAAOC
- AQEAhIY0m1pjMYxgVnHL+AsV2XMNif/xaeSKIH3HAz0j8/7mL1wUub4mf4c5lu3c
- DnzHMe1yY60+x+7kSiq+K5L+dbPWT7NvLWSNqfV+vPJKxuGpBOFq9kVVr9x2uNM4
- bhlPpiDfcoozMF6R0Jnj34iuHAQgSpTfKTjECMNOT9v8jEruFzJxqqnl8H0RX408
- lLx8XMjbVIErKSUgZT0K42rhOa+7nlAinV1SufvHQLjb8bKdnsbNIauCH8aBcs7D
- 94H1j90T/JvshPULLqAgq7FWeXRIqe4YhUT6gqjElnz3L9G+zG+1g/XCkTMdY2X9
- TTVomgOCogTGw8rJ7I2OxSFpFw==
- </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://web.chorus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Chorus Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://web.chorus.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>SO Helpdesk</GivenName>
- <EmailAddress>mailto:sohelpdesk.com.uk@unify.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>SO Helpdesk</GivenName>
- <EmailAddress>mailto:sohelpdesk.com.uk@unify.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 13b2be8e..00000000
--- a/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblearn.ox.ac.uk/shibboleth">
- <!--
- This is a Weblearn Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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://weblearn.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIDCCAgigAwIBAgIJAN09ZW7wF+DGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEXdlYmxlYXJuLm94LmFjLnVrMB4XDTEyMDEyMDE2MzY1MFoXDTIyMDExNzE2
- MzY1MFowHDEaMBgGA1UEAxMRd2VibGVhcm4ub3guYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC3LIZO1N6lP1r5+teOxfmGLNdEwXBzSOndeplc
- Ih2/H6Z3MIerP2weWV/B9jUeDcYT9YGNFHkMRG2FTdHtvS0h/yC/TJOOKy37pqzM
- NiwA1xmmIny/NPhGgIxnjqjAktvtwcGEflb0yoQKkKllA9lotmni6C8jb6PrCqeZ
- YZEq/ficN0Y2fET7l6//Zstld7b6y2/v/CkU/Wy1On5AD5nrO9Ucolq91NnrZc4E
- XqXHQK0SduW+Nb/0zUCX3nl5G0Q0dMbPtc08tTaODSwAt94ycTXwgZkeusVEMVbE
- cS6ZrWHD+mW4nZdy5vgxNlI5ki9ALHbym0RBlW7VcETr1Hq3AgMBAAGjZTBjMEIG
- A1UdEQQ7MDmCEXdlYmxlYXJuLm94LmFjLnVrhiRodHRwczovL3dlYmxlYXJuLm94
- LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFB8DKsVAeiS3EpqWuj4eKj1oa8q0
- MA0GCSqGSIb3DQEBBQUAA4IBAQAb1I5WQNm7Ikoes6JkF4pteKR6ELZM9qOKFwwT
- VSvZ3Dq0FRUYyB06DF/ZNodhvzBNT90N03gB63hNAOWJaW7CPb2d9ZaUG3kQj5ey
- xCkdu5qs0qwvxzZ44zQgLiobRzjVX5tTQkAurKuGBexe53yvjrhDDnkyZznFwO/e
- csdgyJtDrThEVyxzFgROfKepiy80V9+Z0kycDY13v1L+ijBcp1b+plj8poqQx4K5
- Q+uqGo+bvKXrOuCtSWxgsNMNWPh1bMYZLv3P3k98OFJpPHT7yiJq9I+PxcVuQcXF
- 1z2NTzQyONeHUtg8j9A+hog2VXyv3vODtgIv3XG2cuT4fNTn
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Weblearn</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Systems Development and Support</GivenName>
- <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
deleted file mode 100644
index 6eb38c1a..00000000
--- a/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
+++ /dev/null
@@ -1,92 +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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">WIFI provided by GARR</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">WIFI erogato da GARR</mdui:DisplayName>
- <mdui:Description xml:lang="en">Wi-Fi connection to the wireless network in GARR (Rome, IT). This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
- <mdui:Description xml:lang="it">Connessione Wi-Fi alla rete wireless di GARR nella sede di Roma (IT). Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
- <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
-u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
-kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
-ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
-FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
-uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
-ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
-BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
-43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
-UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
-T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
-3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
-Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">WIFI connection provided by GARR</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
- <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
- <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
index bd57a217..e19db917 100644
--- a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
@@ -76,7 +76,7 @@
<Organization>
<OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
<OrganizationDisplayName xml:lang="en">Newcastle University Wiki Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Chris</GivenName>
diff --git a/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5810aaed..00000000
--- a/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wireless.balliol.ox.ac.uk/shibboleth">
- <!--
- This is a "Balliol Wireless Registration" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T20:18:02Z"/>
- </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://wireless.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAL0W0N8MnpwIMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXdpcmVsZXNzLmJhbGxpb2wub3guYWMudWswHhcNMTMwNzAzMTU0NDQ3WhcN
- MjMwNzAxMTU0NDQ3WjAkMSIwIAYDVQQDExl3aXJlbGVzcy5iYWxsaW9sLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl1qmnXqFQamtt0U8
- fM++v+tB39nr+IEiEWbApx+B/eq4ZgCwzlknQYYmb6lFk8s3mbdOvNUkFFzxRU89
- jtdFEaMv9BE2GZCcmS8jlBUfJjRoGtj3qPeLhIgnw4pvy0XhN6GBEGjJmfEaLj6H
- lTaogehd3nn/xo/Tv95kX8PKvmiROn+DEDP7UjAVGDwWCXPpxb9PnUhuuy9qscmN
- FnTTgHyv+euhX2vS5FmKh8Y4nYPG3+tUB/6vcM8ht2ufjnGc2HDAs+uWCfTtt9Ii
- sfmzDugU/ofp4lz716wdTMk3TvvVZz4ka4BdmpkaKiQPgAmEt8id+IwLBtJe3hzy
- UpF2uQIDAQABo0cwRTAkBgNVHREEHTAbghl3aXJlbGVzcy5iYWxsaW9sLm94LmFj
- LnVrMB0GA1UdDgQWBBSW1Hxc9OSMoWtdwVj5ZeOjkPHG+TANBgkqhkiG9w0BAQUF
- AAOCAQEADUulFlwmminMcwKs8F69Tgz7LLK99Cm6CLGacbInrwUUzmWVe3dXjvfd
- VVt2sV6p6DN/wZNiMcLOok13ozgNJZmRX59B0Du/+iFJMaA6v+UpUP7xjLUr0d9Z
- wbnY41XW2Ne/Ncuob6fugIRgRvL4hyYwwxweeET1w7ALWeljHE54Rd6yOM71xlF9
- xFjcoY+Zzmup2CeUd1XVGh6qz5o2IqlHFdx2GiU+2yMefLf4e/Lp5OLeUhzAWRDL
- 4xEP7LxWJRlHWhsQf5fSl9Hv0uZsrm77uA8gtN0OtXS3ZQjM7h5u/CexvhUTr+7Z
- jCw+THjJifsi/CB6ktA9EASTK9vGrw==
- </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://wireless.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Balliol Wireless Registration</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ian</GivenName>
- <SurName>Plummer</SurName>
- <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ian</GivenName>
- <SurName>Plummer</SurName>
- <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 217e022c..00000000
--- a/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wolf-print.wolf.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 Wolfson Print Server SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJANOq9kmAYRWdMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51azAeFw0xMDEwMjgxMzA0NDRaFw0y
- MDEwMjUxMzA0NDRaMCMxITAfBgNVBAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoxdlwPXfGThJT5GBUs
- fVVZVXVHc50sRYZDS2Cs7EQJw4omts2DmN+sRMva8Rpg3GMW8HsaEtzgsvfSXZvp
- S6zFluzdLEOrayxQWemAumYXWbMVGIQjN0olKOQzMPDvdUHesdcLZABdsxXqrEYB
- PURPLCiMN75i9Rl6C3JJay9z2wzU1QSnsT9g8xvpVG1jO/OKvC+MnENWUhfAK0gw
- bVqm10vmvfy8FWn+XSbif02kDMvcXVOm1t7gqkmPlXYDE58iVCg2Gwc2MQbfJKfd
- R7Hj0RziwsmC7MaxARBGnx8yWh3Eu+u73GEU858sCIqU5gAfT4S+O62I2D38baYl
- MlMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd29sZi1wcmludC53b2xmLm94LmFjLnVr
- MB0GA1UdDgQWBBQVWTsmA9E39YYdAz35w5h8M2CxEDANBgkqhkiG9w0BAQUFAAOC
- AQEAI/suxhJXyu5lgBh23wP97d3Mo/LXZ6QxqgFV0PPpADQxnQiEIFwvOcJ4S0sK
- xpdh2Ens5sEowOE110ExqRhPRs8SnpV83tumJMKrFM+sT1+UdmKlKP9ZHwuctghy
- kYfT1FiZcQ4xCP/pL60MDEUHKSQsLOEmINDDeg35oHKUV5/w+DxowvkHCFHExTEK
- OoBkuRw2/wvTRdy8kDWV1XpaVfUj7ci/5F+onPybMpcEStKoDFvtMoxMeoV/j+Ip
- d0Pm166IMhjBQxteWIvPAw9F8QWEbDHL2X7rtjDT61obKLKKlr+RI7SwSd+rmmG+
- Nt9+nCX95b/RaMAOP1/SUQcLTA==
- </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>
- MIIDDzCCAfegAwIBAgIJANOq9kmAYRWdMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51azAeFw0xMDEwMjgxMzA0NDRaFw0y
- MDEwMjUxMzA0NDRaMCMxITAfBgNVBAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoxdlwPXfGThJT5GBUs
- fVVZVXVHc50sRYZDS2Cs7EQJw4omts2DmN+sRMva8Rpg3GMW8HsaEtzgsvfSXZvp
- S6zFluzdLEOrayxQWemAumYXWbMVGIQjN0olKOQzMPDvdUHesdcLZABdsxXqrEYB
- PURPLCiMN75i9Rl6C3JJay9z2wzU1QSnsT9g8xvpVG1jO/OKvC+MnENWUhfAK0gw
- bVqm10vmvfy8FWn+XSbif02kDMvcXVOm1t7gqkmPlXYDE58iVCg2Gwc2MQbfJKfd
- R7Hj0RziwsmC7MaxARBGnx8yWh3Eu+u73GEU858sCIqU5gAfT4S+O62I2D38baYl
- MlMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd29sZi1wcmludC53b2xmLm94LmFjLnVr
- MB0GA1UdDgQWBBQVWTsmA9E39YYdAz35w5h8M2CxEDANBgkqhkiG9w0BAQUFAAOC
- AQEAI/suxhJXyu5lgBh23wP97d3Mo/LXZ6QxqgFV0PPpADQxnQiEIFwvOcJ4S0sK
- xpdh2Ens5sEowOE110ExqRhPRs8SnpV83tumJMKrFM+sT1+UdmKlKP9ZHwuctghy
- kYfT1FiZcQ4xCP/pL60MDEUHKSQsLOEmINDDeg35oHKUV5/w+DxowvkHCFHExTEK
- OoBkuRw2/wvTRdy8kDWV1XpaVfUj7ci/5F+onPybMpcEStKoDFvtMoxMeoV/j+Ip
- d0Pm166IMhjBQxteWIvPAw9F8QWEbDHL2X7rtjDT61obKLKKlr+RI7SwSd+rmmG+
- Nt9+nCX95b/RaMAOP1/SUQcLTA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Wolfson Print Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wolfson.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Wolfson IT Team</GivenName>
- <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Wolfson IT Team</GivenName>
- <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5742dd34..00000000
--- a/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://worc-helium.worc.ox.ac.uk/shibboleth">
- <!--
- This is a "Worcester College" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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="2014-05-28T11:00:42Z">
- <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://worc-helium.worc.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAPxhwWeLeBDXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGXdvcmMtaGVsaXVtLndvcmMub3guYWMudWswHhcNMTQwNTIwMDgyNTU4WhcN
- MjQwNTE3MDgyNTU4WjAkMSIwIAYDVQQDExl3b3JjLWhlbGl1bS53b3JjLm94LmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmLbLe8TwEjaaC03R
- MrxiOUoNbl6NWPFHCJIDQx+iZxLiz2z2m2XoxV6hAo665LEfLw9W2J7ezs65c1pH
- NANZZDCYbP1RfQnwUhi+RUD2HRnUVkxtpEVlFRKYGY/BrPFmDZrl3JYkpKAo8Bat
- QgmppFeAfk6vq1XiKQHaJNZ9u70J/OJJyfaySk+TuIENHKXJPLoj96PyqSYDJR8s
- yzHb/4rlgQw4Re9lt2qca2jgSvSLRHUKh6HZP1aDC8MfTDVv8SYW4lN0tVCoOR7i
- S/ilVQ0bzXqmP+wV0jcC7pZFKfJVg0lghQ9IYlTqkXpZTxVkpq5QUnUJzQIeBJJE
- PuX2VwIDAQABo0cwRTAkBgNVHREEHTAbghl3b3JjLWhlbGl1bS53b3JjLm94LmFj
- LnVrMB0GA1UdDgQWBBRb2Hss1FfaYrDXm3LjSbSUoBFm3DANBgkqhkiG9w0BAQUF
- AAOCAQEAd8t3tqqcV3bkE0RY+fqe927xLwv+Wu/d6x7XdyWnEuF2sBlPFrXOvQGI
- Dn/lLXcBKTegExgMWJMJWfvDdvnFJNE3bEIFPzbAVflIrEFCpjRQddeyuai2zhXI
- uSJ3MY2TtkdrL3NwkXcW1iWJC53cEMCVCOL2F1Iu//aDnLb2cJ4EserpHd7tW7SW
- ljqH7+Oh6I4We8uAHXLATIx5AWiJb3eBDTIW4+2ONMTmM1h46w5PaEZc18Q33V8l
- s8OgMS4FQndWsAxmlifeTc8Q43CYwnUptF4O9L6G2m+tY7MZYmXs4NlIyjcNrjo4
- L0NVEMMPEA9hZ7XNpgNMgL66E6tSMg==
- </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://worc-helium.worc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Worcester College</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.worc.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Karen</GivenName>
- <SurName>Wells</SurName>
- <EmailAddress>mailto:computing.manager@worc.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Karen</GivenName>
- <SurName>Wells</SurName>
- <EmailAddress>mailto:computing.manager@worc.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml b/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml
deleted file mode 100644
index 72157aad..00000000
--- a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.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://www-test.cartoons.ac.uk/_sp">
- <!--
- This is a "British Cartoon Archive (TEST)" simpleSAMLphp SP for the University of Kent.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-31T13:14:38Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">British Cartoon Archive (TEST)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Test British Cartoon Archive service (not for public use)</mdui:Description>
- <mdui:Logo height="65" width="234">https://www.cartoons.ac.uk/sites/all/themes/bcad/images/logos/bcad-logo.gif</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID8zCCAtugAwIBAgIJAKE2TIxIQxuCMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
- VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEbMBkG
- A1UECgwSVW5pdmVyc2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBT
- ZXJ2aWNlczEgMB4GA1UEAwwXd3d3LXRlc3QuY2FydG9vbnMuYWMudWswHhcNMTUw
- MzMxMTAzOTA0WhcNMjUwMzMwMTAzOTA0WjCBjzELMAkGA1UEBhMCR0IxDTALBgNV
- BAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoMElVuaXZlcnNp
- dHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRpb24gU2VydmljZXMxIDAeBgNV
- BAMMF3d3dy10ZXN0LmNhcnRvb25zLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAn1JbzpY2ZOG1l0q+VvK3pP+eaBPU468X5pj3c8HRI444tIpj
- mYW6HWzz5OAra400QkZM72cNTFjCscO4OWnA7SbqkXlpv3vVxMZ8PX9fBf/cxsMH
- LBNXoMQh1D85N0Z0r4mhqDJzLfOdJVIQAog22hqyZpgxJ0c48TLcllllzQf1xhDh
- hj1hPPVd9hrUGbmnI0rod55Z5z7dqxrtsEmGYM6BLBjQT3IO02YKGa/4bgW3Wxoo
- UYKnKFIhtF54a2oRTG3xhSpvH9xABSFzrmQ+k4jT+1yb7OR77BjqBWKFgSVZxh0I
- 8KuzLE8fJiLfmIdG1ZtHoaMOEhW74IqSWHUznQIDAQABo1AwTjAdBgNVHQ4EFgQU
- p/i93quZlOSka+XAjKPjxFi3hR0wHwYDVR0jBBgwFoAUp/i93quZlOSka+XAjKPj
- xFi3hR0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAV72ikG+e8fAy
- NjSMDbA/2ArD7kYrSj3dmyYVatghL3doZCVEm9ZyGo6x/jW/QyFVn4P43kMR4min
- fwJZi4ooUOFeDTta4YfLFMYVdvYTMNrJs1UtN6/iOFvFud4mdW+VdnfEzqgkRyG8
- rYSVKtYKbiqdxigVVY0icvpu2cvJrkAtAcZOmuZn+HtbU/PUsHcs2GmOL5pF++M5
- hcSgpWFmTZgZZFUEpzUQC7c+Coz5QGPkfSI7y5hE01ePdbITgXTGprC2Ep23su5X
- It7yGAT8rRCp52rrT7aB8ih0rNLDulVHovCf18GJuw0luo8XEmv7wWQmTMcA70qA
- enohx6xxVA==
- </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>
- MIID8zCCAtugAwIBAgIJAKE2TIxIQxuCMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
- VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEbMBkG
- A1UECgwSVW5pdmVyc2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBT
- ZXJ2aWNlczEgMB4GA1UEAwwXd3d3LXRlc3QuY2FydG9vbnMuYWMudWswHhcNMTUw
- MzMxMTAzOTA0WhcNMjUwMzMwMTAzOTA0WjCBjzELMAkGA1UEBhMCR0IxDTALBgNV
- BAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoMElVuaXZlcnNp
- dHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRpb24gU2VydmljZXMxIDAeBgNV
- BAMMF3d3dy10ZXN0LmNhcnRvb25zLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAn1JbzpY2ZOG1l0q+VvK3pP+eaBPU468X5pj3c8HRI444tIpj
- mYW6HWzz5OAra400QkZM72cNTFjCscO4OWnA7SbqkXlpv3vVxMZ8PX9fBf/cxsMH
- LBNXoMQh1D85N0Z0r4mhqDJzLfOdJVIQAog22hqyZpgxJ0c48TLcllllzQf1xhDh
- hj1hPPVd9hrUGbmnI0rod55Z5z7dqxrtsEmGYM6BLBjQT3IO02YKGa/4bgW3Wxoo
- UYKnKFIhtF54a2oRTG3xhSpvH9xABSFzrmQ+k4jT+1yb7OR77BjqBWKFgSVZxh0I
- 8KuzLE8fJiLfmIdG1ZtHoaMOEhW74IqSWHUznQIDAQABo1AwTjAdBgNVHQ4EFgQU
- p/i93quZlOSka+XAjKPjxFi3hR0wHwYDVR0jBBgwFoAUp/i93quZlOSka+XAjKPj
- xFi3hR0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAV72ikG+e8fAy
- NjSMDbA/2ArD7kYrSj3dmyYVatghL3doZCVEm9ZyGo6x/jW/QyFVn4P43kMR4min
- fwJZi4ooUOFeDTta4YfLFMYVdvYTMNrJs1UtN6/iOFvFud4mdW+VdnfEzqgkRyG8
- rYSVKtYKbiqdxigVVY0icvpu2cvJrkAtAcZOmuZn+HtbU/PUsHcs2GmOL5pF++M5
- hcSgpWFmTZgZZFUEpzUQC7c+Coz5QGPkfSI7y5hE01ePdbITgXTGprC2Ep23su5X
- It7yGAT8rRCp52rrT7aB8ih0rNLDulVHovCf18GJuw0luo8XEmv7wWQmTMcA70qA
- enohx6xxVA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Kent</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive (TEST)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Helpdesk</GivenName>
- <EmailAddress>mailto:helpdesk@kent.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Matthew</GivenName>
- <SurName>Slowe</SurName>
- <EmailAddress>mailto:M.Slowe@kent.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml
deleted file mode 100644
index 598a8cf7..00000000
--- a/swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bjhcm.co.uk/shibboleth">
- <!--
- This is a bjhcm.co.uk OpenAthens SP for MA Healthcare Limited.
- -->
- <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>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFBDCCA+ygAwIBAgIJAJ0dMnvmlXpZMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
- VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGzAZBgNV
- BAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMRgwFgYDVQQDEw93
- d3cuYmpoY20uY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xsYXJkQG1hcmth
- bGxlbmdyb3VwLmNvbTAeFw0xMDExMTgwOTM4MTJaFw0yMDExMTUwOTM4MTJaMIGj
- MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24x
- GzAZBgNVBAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMRgwFgYD
- VQQDEw93d3cuYmpoY20uY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xsYXJk
- QG1hcmthbGxlbmdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
- ggEBAMFJMPZrCB4R0FGaIwXrM56fwY75Rt9sA2oAL5VitN01BhItwr1+VA+Agl6s
- Icm/nkhQt5P6Rk6JAc//cgft37u2CpC3JLryLR4xL4lmSHofcRsRABs8+/BqDfDz
- D7pupIMeeUV0wJqV7EECzdGY2n4QDe/oHMRlWQVEYSSOrZNqgpOXD3c51HxJeMs2
- EUbOMonjxp8NVXZFdgeDNXwys+rsA81PipU+PMhVF5pCtPnwWlwd91G+3Q/VqyiR
- mWynFz7KcWsBFI9Ms/JHnbLdHknMs1yvbPJF8JdpxktaRyQAFuwy7Iag4/9CFDul
- 3yCL7Ubn6q+8MYdO+nUZsSN01z0CAwEAAaOCATcwggEzMAkGA1UdEwQCMAAwLAYJ
- YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
- DgQWBBRdDheBuWTHljSJkR0G+mboL7G+wTCB2AYDVR0jBIHQMIHNgBRdDheBuWTH
- ljSJkR0G+mboL7G+waGBqaSBpjCBozELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxv
- bmRvbjEPMA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJNYSBIZWFsdGhjYXJlIEx0
- ZC4xDDAKBgNVBAsTA3dlYjEYMBYGA1UEAxMPd3d3LmJqaGNtLmNvLnVrMS0wKwYJ
- KoZIhvcNAQkBFh50b20ucG9sbGFyZEBtYXJrYWxsZW5ncm91cC5jb22CCQCdHTJ7
- 5pV6WTANBgkqhkiG9w0BAQUFAAOCAQEAcAIeF4Vx7UA/+lEoZ5VB+5cfKodmIorI
- oxbwQcKVvCrC5aziWcPVpzCE3u4lS4Qad2YJFzHSUyHQQ37IrmrfzEhctFJAxvaX
- QF/XmEj+CW0OkaDxWSYTZfzL3XJk3OA213pbq6ORo3qVNQB5lwajhq0cK12G+Jzm
- W/lRqlPGzX0MFVafCrgkCrD1qgg+w5T6KGNtMWZUtsjpD+WN64kUoV9pKU8itUf5
- iaKjGvk2mhyFQ/jC5HMLSc6w//OmpSjsrQmg7R7sDoZsPgPMM6EGUfwIBfWDqqEM
- FkiDK5odPpv8XOuhavrPqL9CL3sRnGMezE7UyPX/rytg4BeOytPubA==
- </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://www.bjhcm.co.uk/auth/rcv/ukfed" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bjhcm.co.uk/auth/rcv/ukfed" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">MA Healthcare Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">MA Healthcare Limited: bjhcm.co.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bjhcm.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Tom</GivenName>
- <SurName>Pollard</SurName>
- <EmailAddress>mailto:tom.pollard@markallengroup.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ella</GivenName>
- <SurName>Horswell</SurName>
- <EmailAddress>mailto:ella.horswell@fsite.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml b/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml
deleted file mode 100644
index 95f15bbe..00000000
--- a/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.blikbook.com/shibboleth">
- <!--
- This is a "BlikBook" Shibboleth SP for BlikBook Ltd.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T13:52:15Z">
- <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>
- <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.blikbook.com/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIICzTCCAbWgAwIBAgIJAKNuWk4C+NN7MA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
- BAMTAjE0MB4XDTEzMDkwNTE4NTM0M1oXDTIzMDkwMzE4NTM0M1owDTELMAkGA1UE
- AxMCMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnU7lRsAO3JWdF
- CV6hbwomTdJAw5Q75PHIVIDhgk6WFtKhBjiUSJDKv+1H2AreuEYGpRX7crXJ8JeR
- 4ox4dB1FKr76FsNS2d38VkgzmyVTyAj1YgFZS5PKrzIogh4s2/h+DFGu2FAkgdFs
- qXf/B+sWAnbDyfgr7wp+QzfVscCYHFDtmrul9EoYD704Emk3H4ViEZLZHjw9UCHl
- HCUA2mNFKQu6hBRPLy//9yvyvbb5SuxmVVExPTpaUwqDtYlgajeI0pno1cRckGkf
- A6W4teAaNTxqEstYWOO8VxmhT5SfzaW2EwvKRlnELoWnUjXkvaPBbL00BN7ge4Qs
- Np1lDzcBAgMBAAGjMDAuMA0GA1UdEQQGMASCAjE0MB0GA1UdDgQWBBSlgdjTlZKI
- 9VBvUaa8t9oNtgHOmDANBgkqhkiG9w0BAQUFAAOCAQEAYvPZozk1OlBNuSP6+ewU
- n+KivoAQGT8AiLbtjVziG74zqTfUoro9GDdGpLiq9lAodgGMkUou3gpEyVbI1oOa
- AJF35OSCHPgy+I5czpDM/ir25tyFsO8CsJfMH56DwB8fGYr4x3cHFkm++kZj2Ew6
- VfYnG4+9paWJcUU6kdgxhNRQpiSVbDmZ/NP/Z8GR02tkZNGm0vJgaPRI8FmxUIjL
- 1mBPt1KOIRpN+RTQZ7G24iamdHVkzeYW5PnzFv9KWtC7CzCMdcML333WFliSn//G
- GOD58oPBiX7W3bcbxgiMeI2vQe3/wmOH8sRDMOCUheWd5tt2WpA0asts4k7kOfm6
- sw==
- </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>
- MIICzTCCAbWgAwIBAgIJAKNuWk4C+NN7MA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
- BAMTAjE0MB4XDTEzMDkwNTE4NTM0M1oXDTIzMDkwMzE4NTM0M1owDTELMAkGA1UE
- AxMCMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnU7lRsAO3JWdF
- CV6hbwomTdJAw5Q75PHIVIDhgk6WFtKhBjiUSJDKv+1H2AreuEYGpRX7crXJ8JeR
- 4ox4dB1FKr76FsNS2d38VkgzmyVTyAj1YgFZS5PKrzIogh4s2/h+DFGu2FAkgdFs
- qXf/B+sWAnbDyfgr7wp+QzfVscCYHFDtmrul9EoYD704Emk3H4ViEZLZHjw9UCHl
- HCUA2mNFKQu6hBRPLy//9yvyvbb5SuxmVVExPTpaUwqDtYlgajeI0pno1cRckGkf
- A6W4teAaNTxqEstYWOO8VxmhT5SfzaW2EwvKRlnELoWnUjXkvaPBbL00BN7ge4Qs
- Np1lDzcBAgMBAAGjMDAuMA0GA1UdEQQGMASCAjE0MB0GA1UdDgQWBBSlgdjTlZKI
- 9VBvUaa8t9oNtgHOmDANBgkqhkiG9w0BAQUFAAOCAQEAYvPZozk1OlBNuSP6+ewU
- n+KivoAQGT8AiLbtjVziG74zqTfUoro9GDdGpLiq9lAodgGMkUou3gpEyVbI1oOa
- AJF35OSCHPgy+I5czpDM/ir25tyFsO8CsJfMH56DwB8fGYr4x3cHFkm++kZj2Ew6
- VfYnG4+9paWJcUU6kdgxhNRQpiSVbDmZ/NP/Z8GR02tkZNGm0vJgaPRI8FmxUIjL
- 1mBPt1KOIRpN+RTQZ7G24iamdHVkzeYW5PnzFv9KWtC7CzCMdcML333WFliSn//G
- GOD58oPBiX7W3bcbxgiMeI2vQe3/wmOH8sRDMOCUheWd5tt2WpA0asts4k7kOfm6
- sw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.blikbook.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.blikbook.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.blikbook.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.blikbook.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">BlikBook Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">BlikBook</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.blikbook.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Deepak</GivenName>
- <SurName>Colluru</SurName>
- <EmailAddress>mailto:deepak@blikbook.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Giles</GivenName>
- <SurName>Greenway</SurName>
- <EmailAddress>mailto:giles@blikbook.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4d5d9b55..00000000
--- a/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.careers.ox.ac.uk/shibboleth">
- <!--
- This is a "The Careers Service" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-28T11:49:56Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDKzCCAhOgAwIBAgIJAKLT36LHYvclMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmNhcy13ZWJzZXJ2ZXIuY2FzLm94LmFjLnVrMB4XDTE0MTAyMzE1NTAyN1oX
- DTI0MTAyMDE1NTAyN1owJTEjMCEGA1UEAxMaY2FzLXdlYnNlcnZlci5jYXMub3gu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR6Q04iL3jR3oU
- sySnZ5F9DDseuV33hBS8/meYFa6vxWg//bvdZSkPfrUvmCKuPOJOJR+c+hIcgE7n
- j6SX2OikmV9ffX/Hf7rmmShhE7KsuRI+u7DVhuWAhth5SPsJ58HChIcgOVzaG/Y8
- TBfcFOGwT9PsJfM21yKexx4r7F85ghg/bRxWzrYtt9V8iH/9GkhvTG52/3/H4r0E
- djx5cjWGWHpAoOI4cpocD2fD+hrhVfddlQbnoIrJXYAr/mnOFsCe9EXWz3yHajiV
- 6BNiZ7YQ8bksb0Fs+04lOJJTA+bl6fU6jHu27lPoTuFjjSbjP5DmODYZcVReZtpV
- BIxaVyEbAgMBAAGjXjBcMDsGA1UdEQQ0MDKCGmNhcy13ZWJzZXJ2ZXIuY2FzLm94
- LmFjLnVrhhR3d3cuY2FyZWVycy5veC5hYy51azAdBgNVHQ4EFgQUOp4S1i97HslI
- CAvETjdX3hklGtMwDQYJKoZIhvcNAQEFBQADggEBAAE3mAzXIYYSJn603hy8TDIx
- sV9fKNzxTIHZZyTTRNeA2drgoqSJcu4uK1kZNblf2C/O9Y1ndi9hzDQ2hUYiP6lH
- 5ItyjgTs70MTtrTOjaD//oUzk3RH+7dYxLbky+WqBE3atuO6LU5wbUF7ro41G2ga
- 6KayOZG6xXWvvh5/1+tU6/GlM29DX+gxkitTzqsd0YXFzrHFJTUPSVqbeAx36vqY
- 4BDB+eW3lvRBh9PwS12hOhFKU2o0cyHylBLUNVCxVvyTt1QSib4B1zsAp6vYYfr8
- VliUnZa2BBl0uf4sXtVfg1iRvgVWE584lqdBCYW8k8Y/7R0MsCc8A+73HqrsnV8=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - The Careers Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.careers.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@careers.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Support</GivenName>
- <EmailAddress>mailto:it-support@careers.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
index 2e42ba3c..eff01074 100644
--- a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
@@ -7,8 +7,8 @@
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml
deleted file mode 100644
index 9bb4d8cc..00000000
--- a/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.edgehillsu.org.uk/shibboleth">
- <!--
- This is a Shibboleth 2 SP for Membership Solutions Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
- MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
- 6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
- hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
- MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
- aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
- Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
- HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
- daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
- FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
- wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
- 4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
- rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
- eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
- </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>
- MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
- MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
- 6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
- hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
- MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
- aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
- Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
- HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
- daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
- FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
- wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
- 4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
- rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
- eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Edge Hill Students' Union</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.edgehillsu.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>MSL support</GivenName>
- <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Bonsall</SurName>
- <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 65ba3d03..00000000
--- a/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.it.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:56:05Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9DCCAdygAwIBAgIJALiR16U+pefzMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
- BAMTD3d3dy5pdC5veC5hYy51azAeFw0xNDA5MDkwNjU5NTFaFw0yNDA5MDYwNjU5
- NTFaMBoxGDAWBgNVBAMTD3d3dy5pdC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAOABFZclDrQXCNO8wK1S1Tt8039mZWM/56weI2lVBwmN
- aai/dxp6Gm+vKqGAT6kjEKJfJ3pZolQgW5mCae/3OA8MAn0R8qS9X/rD9BxI5Ojt
- cGKDJnEjjbmPr52NdYqyIYj20LN3bu4CW/8fDIc7UKKN22D2er8QS/qUVzjwtgju
- aMh98joueAhStymx23IJXFhFMrg/Rq8JWdavUMCZbbs/RrrBQT5fIINJHvax0/fS
- gxRRCzu4tm28PoC9Sk0S52DlL0zUCgowuWyUCr60ki/ACi+aCvf0GHStDnvdWixE
- CMLnab/B4XFOv35fIBfq3ZXZ1tJwVI0uAhbqeXbjK/UCAwEAAaM9MDswGgYDVR0R
- BBMwEYIPd3d3Lml0Lm94LmFjLnVrMB0GA1UdDgQWBBTuCDHn6ylly7cHFIau2Gav
- jZRgLjANBgkqhkiG9w0BAQUFAAOCAQEAfqLFckAdO1Q1EWGbNCs1rMRRnrQhOJgY
- 5qbsoBKjfAij1z2avZJLtoqNmiSglMRJAaQymrx4lRUeZeZMWKvftE11c+9HRmq9
- EN4fOmHyWttTc7QUtq+28Xj7N5t1yCYJPK04GcCoGy3x3ZF+Z08vCzIEk2OceE0r
- duOhRjYNHwG+VZjOnhBKWOs6UeYSHEci4XKr7fF4ocCkoww1/edkVuZD2pGy7Sao
- P/JIEQd+URAlarYO35ZmHsYStSGbaQqm219AXhRuI3AgwhwEeyNFPqH+R5iYq5Nk
- UOpxlu7UHRZ26ugA3ldH/hcFkRPpDdopu7qESNCfpanceMeXx3Re8A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - www.it.ox.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
deleted file mode 100644
index 22d70312..00000000
--- a/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jordanpublishingcpd.co.uk/shibboleth">
- <!--
- This is a Shibboleth SP for Jordan Publishing Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <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.jordanpublishingcpd.co.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Jordan Publishing / Family Law</mdui:DisplayName>
- <mdui:Description xml:lang="en">For access to law reports, case law, commentary, precedents and legal and administrative changes.</mdui:Description>
- <mdui:Logo height="64" width="252">https://www.jordanpublishingcpd.co.uk/jordanslogo.gif</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDYjCCAkoCCQCgLsM5xyLGGDANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
- QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEYMBYGA1UEChMP
- Sm9yZGFucyBMaW1pdGVkMSYwJAYDVQQDEx13d3cuam9yZGFucHVibGlzaGluZ2Nw
- ZC5jby51azAeFw0xMTEwMTAwOTUzMDBaFw00MTEwMDIwOTUzMDBaMHMxCzAJBgNV
- BAYTAkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRgwFgYD
- VQQKEw9Kb3JkYW5zIExpbWl0ZWQxJjAkBgNVBAMTHXd3dy5qb3JkYW5wdWJsaXNo
- aW5nY3BkLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFsJ
- DikTpQWue+TeFD7f/SxyB95/b4D1a/4L04NtzzauQ9G+IZmtzoVvIadkYNZEqBA6
- gyYddDxQ2z74PO/NUY04xicrwMLsm51CZz6UpZcA/g3Plr0qCNKpQdR6xiZwbH5r
- QPvNDVpR+k1tcI/ylmvH5XW/XOHqIpr1cWAINiBCs4YXNy26c0V/1iBApKRovTyY
- Oy2ZqxDLzC1l4xe8AliI318JcIm6ObOk3Z8OjmtzKla58xtjswvQsLVyIlb/10eA
- XZUUHBjhgl8ule7T9isYtJ250xcfYW37Px8eERxOyTuCi7NEkQGiniSEnzp9PP5P
- Uf4sugluTP/MRvKkqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBJ5V21s9XjpfI5
- t+vb7eleCZOdrFOA0ON9l24CDTADuhakdFA473JgIvjGk2m/VbH5nLZDI26IRIuv
- lm2G6eaE2FZrDCu/EScmm4G8UxuYWXXj2+grYeWJ/o9U5Zbm38a2j/z2guDCfaO2
- +3DYYegalq7klPCuwdvN9lObF/8elD3NAx7sFgR0DAyZNF57ppejnrC3yVpyWizO
- /0hdLckeOfpxUyal2UFB0H7hUqShfBJiJykMczpocFYRPEuOr+21Z89eoAQbplfM
- ln8E55bf4eHw1k6Wb95K3VeDqwSznFWVXIkxEiWXCuKXxHd+J145S3YZe5ayeRvz
- wdxJFa0Y
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Jordan Publishing Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Jordan Publishing / Family Law</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.jordanpublishing.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Withers</SurName>
- <EmailAddress>mailto:simon_withers@jordanpublishing.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jordan Publishing technical support</GivenName>
- <EmailAddress>mailto:electronic@jordanpublishing.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml b/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml
deleted file mode 100644
index ac7f7c8f..00000000
--- a/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.klarro.net/shibboleth">
- <!--
- This is a "BlikBook Pre-deploy" Shibboleth SP for BlikBook Ltd.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-27T15:57:13Z"/>
- </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>
- <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.klarro.net/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAIt6YjNtpR2RMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB0RhblRlc3QwHhcNMTMwNjE5MTYxNTMzWhcNMjMwNjE3MTYxNTMzWjASMRAw
- DgYDVQQDEwdEYW5UZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- wdnVZ1MhtfN0ukc6dLjy5QjoRSXWQCFGpZ5QvZNtP3xsKSqX8iOhm1ZmH1l1K0Y5
- ZV3HC44bNA92cGpsq9sMknjkarkmH439iiXgt9qUMIMynxpPmY6GkDJzecw437CX
- CXKf8DihNAldXEKUc3CzP4Vk4lNI8e+ektHq7wV3lLQrG3qyJ65g3jWVO84RnXPm
- B9f3wQqW3R/zroCGxjcBvO901JNCuOQHtUrO7mHlJoQBJq4ARQkUbvtNSB6dQqS5
- Z/YhDSKxq9AXTXzmRssc9Ke8NQxMNh74cFF+El8s6SMA8hnGP4mEAlr8FGt0aIA+
- 1kkaIetVBGQuKVyVKtLD7wIDAQABozUwMzASBgNVHREECzAJggdEYW5UZXN0MB0G
- A1UdDgQWBBT4QfMQ8phl2CCuvtshXflmGE9IRzANBgkqhkiG9w0BAQUFAAOCAQEA
- J+s9az6w7b47PnAFU1DSHMjeFKTmc9hHmyp0V9PQWP5ONO2W8aebU5fIPlQ1H0UW
- cq4GBDGB00I48DulVZ6eZTGb7V2PQrjWkBTx+zTchMj/C8y0WwILDb2lSmX8lSrg
- hWqVtEpvi3bJAuq4Z9wJrtMn/meOAUOJd8jMum66iFHJ2Sx4p8RII+pxs815DsYc
- LP1zfxaGdMeSAiTLn9pGMpNCykpLu5MYgRsZYg11rxtzK7xnxVGZBT+/bEXYrvxk
- yyI3tafZkac5nvFsbdP1CVTkxLXhjoC/cOraO4qLe6XccTTzeRP06u9IYWkd21Xs
- KEvVQWisWGKnGQlunjVxaQ==
- </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>
- MIIC3DCCAcSgAwIBAgIJAIt6YjNtpR2RMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB0RhblRlc3QwHhcNMTMwNjE5MTYxNTMzWhcNMjMwNjE3MTYxNTMzWjASMRAw
- DgYDVQQDEwdEYW5UZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- wdnVZ1MhtfN0ukc6dLjy5QjoRSXWQCFGpZ5QvZNtP3xsKSqX8iOhm1ZmH1l1K0Y5
- ZV3HC44bNA92cGpsq9sMknjkarkmH439iiXgt9qUMIMynxpPmY6GkDJzecw437CX
- CXKf8DihNAldXEKUc3CzP4Vk4lNI8e+ektHq7wV3lLQrG3qyJ65g3jWVO84RnXPm
- B9f3wQqW3R/zroCGxjcBvO901JNCuOQHtUrO7mHlJoQBJq4ARQkUbvtNSB6dQqS5
- Z/YhDSKxq9AXTXzmRssc9Ke8NQxMNh74cFF+El8s6SMA8hnGP4mEAlr8FGt0aIA+
- 1kkaIetVBGQuKVyVKtLD7wIDAQABozUwMzASBgNVHREECzAJggdEYW5UZXN0MB0G
- A1UdDgQWBBT4QfMQ8phl2CCuvtshXflmGE9IRzANBgkqhkiG9w0BAQUFAAOCAQEA
- J+s9az6w7b47PnAFU1DSHMjeFKTmc9hHmyp0V9PQWP5ONO2W8aebU5fIPlQ1H0UW
- cq4GBDGB00I48DulVZ6eZTGb7V2PQrjWkBTx+zTchMj/C8y0WwILDb2lSmX8lSrg
- hWqVtEpvi3bJAuq4Z9wJrtMn/meOAUOJd8jMum66iFHJ2Sx4p8RII+pxs815DsYc
- LP1zfxaGdMeSAiTLn9pGMpNCykpLu5MYgRsZYg11rxtzK7xnxVGZBT+/bEXYrvxk
- yyI3tafZkac5nvFsbdP1CVTkxLXhjoC/cOraO4qLe6XccTTzeRP06u9IYWkd21Xs
- KEvVQWisWGKnGQlunjVxaQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.klarro.net/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.klarro.net/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.klarro.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.klarro.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.klarro.net/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.klarro.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">BlikBook Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">BlikBook Pre-deploy</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.klarro.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Deepak</GivenName>
- <SurName>Colluru</SurName>
- <EmailAddress>mailto:deepak@blikbook.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Giles</GivenName>
- <SurName>Greenway</SurName>
- <EmailAddress>mailto:giles@blikbook.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml b/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml
deleted file mode 100644
index 8b1d2db7..00000000
--- a/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.learninggrids.com/shibboleth">
- <!--
- This is a Shibboleth 2.3.1 test SP for Crick Software Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGTCCAgGgAwIBAgIJAMKYSg+3GU17MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFHNwLmxlYXJuaW5nZ3JpZHMuY29tMB4XDTEwMDQwOTE0MzI0MVoXDTIwMDQw
- NjE0MzI0MVowHzEdMBsGA1UEAxMUc3AubGVhcm5pbmdncmlkcy5jb20wggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT1mJfobR9rxjkPud227louYV544Lv
- Kub5HQMU56EhOmenz8Wp9XTjJNqcko/k82N6XD0RqC/M6YRiUmOV16Yk0urTXaKe
- kL/SLkVMNZxOEZ8oXLkysw0E2jFhKyB1kx7T7t2eLw/RM7fXo7KQyBl/ahKM0LVJ
- F7vhL1n6eCuU6uOAkSsWmYlULjSOTaH2IPKUsaNVjqPn5gQfgs+G453dJnRbwdmh
- fsKGImH5CWfCGUKpd3PTVJtveXWWzz4+gPfS+hN4patbj2L7unLFZLyi1f+EFpry
- ePT4C8YFYBHUhtoDAsfnPdXZpu5t4pXhyP3RBjeMHppKmxS5cUmDH+sbAgMBAAGj
- WDBWMDUGA1UdEQQuMCyCFHNwLmxlYXJuaW5nZ3JpZHMuY29thhRzcC5sZWFybmlu
- Z2dyaWRzLmNvbTAdBgNVHQ4EFgQUzt6Iwba+1fpMyELfdUCRMh49LF8wDQYJKoZI
- hvcNAQEFBQADggEBAIExIazrssEJfB0OAtCS2rodzsrH7GsTzkPZ8ylRC4b2eXHU
- AVncNc4nWdLhPuXACSgH8+kL8dOEL3BGDZNc3UwJKyzODv9+PGhGxFHDDbK0JGTn
- dpSl2dXCKv5rTteTdejjgMZcU0mL6Fntv4HYlgTPG+77UyMM8WfbwIGeWQT3XM66
- xM/K9NUuHPp3wUJ9801cV3XvB8ojILIZwIRbbKze2NgK8Eda3eC5gQWSH1WBvCav
- hH4a83QfDDECmHpUVa/eHYkfjWLBNtG7KdGwBLRSH1GbmpUSe0TEwW0wWGCU3R4D
- OM66RXoED823lMyOTZ6WpPEuAzAAysHcpXP2PlQ=
- </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>
- MIIDGTCCAgGgAwIBAgIJAMKYSg+3GU17MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFHNwLmxlYXJuaW5nZ3JpZHMuY29tMB4XDTEwMDQwOTE0MzI0MVoXDTIwMDQw
- NjE0MzI0MVowHzEdMBsGA1UEAxMUc3AubGVhcm5pbmdncmlkcy5jb20wggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT1mJfobR9rxjkPud227louYV544Lv
- Kub5HQMU56EhOmenz8Wp9XTjJNqcko/k82N6XD0RqC/M6YRiUmOV16Yk0urTXaKe
- kL/SLkVMNZxOEZ8oXLkysw0E2jFhKyB1kx7T7t2eLw/RM7fXo7KQyBl/ahKM0LVJ
- F7vhL1n6eCuU6uOAkSsWmYlULjSOTaH2IPKUsaNVjqPn5gQfgs+G453dJnRbwdmh
- fsKGImH5CWfCGUKpd3PTVJtveXWWzz4+gPfS+hN4patbj2L7unLFZLyi1f+EFpry
- ePT4C8YFYBHUhtoDAsfnPdXZpu5t4pXhyP3RBjeMHppKmxS5cUmDH+sbAgMBAAGj
- WDBWMDUGA1UdEQQuMCyCFHNwLmxlYXJuaW5nZ3JpZHMuY29thhRzcC5sZWFybmlu
- Z2dyaWRzLmNvbTAdBgNVHQ4EFgQUzt6Iwba+1fpMyELfdUCRMh49LF8wDQYJKoZI
- hvcNAQEFBQADggEBAIExIazrssEJfB0OAtCS2rodzsrH7GsTzkPZ8ylRC4b2eXHU
- AVncNc4nWdLhPuXACSgH8+kL8dOEL3BGDZNc3UwJKyzODv9+PGhGxFHDDbK0JGTn
- dpSl2dXCKv5rTteTdejjgMZcU0mL6Fntv4HYlgTPG+77UyMM8WfbwIGeWQT3XM66
- xM/K9NUuHPp3wUJ9801cV3XvB8ojILIZwIRbbKze2NgK8Eda3eC5gQWSH1WBvCav
- hH4a83QfDDECmHpUVa/eHYkfjWLBNtG7KdGwBLRSH1GbmpUSe0TEwW0wWGCU3R4D
- OM66RXoED823lMyOTZ6WpPEuAzAAysHcpXP2PlQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.learninggrids.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.learninggrids.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Crick Software Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">LearningGrids from Crick Software Ltd - Test</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cricksoft.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andrew</GivenName>
- <SurName>Burt</SurName>
- <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andrew</GivenName>
- <SurName>Burt</SurName>
- <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml
deleted file mode 100644
index d46f66c5..00000000
--- a/swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mmunion.co.uk/shibboleth">
- <!--
- This is a Shibboleth 2.3.1 'MM Union' SP owned by Membership Solutions Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
- MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
- 6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
- hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
- MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
- aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
- Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
- HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
- daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
- FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
- wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
- 4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
- rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
- eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Membership Solutions: MM Union</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.mmunion.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Bonsall</SurName>
- <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Bonsall</SurName>
- <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml
new file mode 100644
index 00000000..767be5d9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mynsu.co.uk/shibboleth">
+ <!--
+ This is a "Northumbria Students' Union" Shibboleth SP for Membership Solutions Limited.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T08:23:54Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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.mynsu.co.uk/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+ BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+ WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+ AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+ FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+ Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+ kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+ 0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+ 5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+ gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+ BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+ EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+ 70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+ QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+ MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
+ Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Northumbria Students' Union</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.mynsu.co.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>MSL support</GivenName>
+ <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>James</GivenName>
+ <SurName>Bonsall</SurName>
+ <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
index 5746c2f4..ccb9ad2a 100644
--- a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
@@ -11,43 +11,43 @@
<mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
<mdui:Description xml:lang="fi">Biolääketieteen Moodle verkkokursseja Nordbiomed ohjelman opiskelijoille</mdui:Description>
<mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
- <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIRANbySfQqDQ9zZ4V2aSBw+r4wDQYJKoZIhvcNAQEFBQAw
-QTELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUdBTkRJIFNBUzEeMBwGA1UEAxMVR2Fu
-ZGkgU3RhbmRhcmQgU1NMIENBMB4XDTE0MDgwODAwMDAwMFoXDTE1MDgwODIzNTk1
-OVowWTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQL
-ExJHYW5kaSBTdGFuZGFyZCBTU0wxFzAVBgNVBAMTDm5vcmRiaW9tZWQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLoUtGc7MKdSOLEwoAY58MFq
-SPgKPpQlfqeDbE18ivhw96/wS7OYWLyMUBM4Wj2fnoXHXDxMF2MQhusRJjfXmzw8
-md0YBoylbajo14cCaen6PjZdD8m9b0KsqtQy8yqa/KWVMuUoM2vonOtBpsML4mP6
-NVhNU0imUDMsfAgnaoG2EfAA190FVX9oybDUaLbK7P9finunX0/mwxfxKYf45klw
-VDDym6rRBuLBOUSD+RAD4LSZ8WbQNC0XyHTk/pgD4odrT3S8knq24Y0SVTJOADW4
-e5lPX2G8Vn0vJXL1MAZdRotM4VY5fvAf76zDD77jca3i6b0qTYFOgYMytL5/5QID
-AQABo4IBvDCCAbgwHwYDVR0jBBgwFoAUtqj/oqgv0KbNS7Fo8+dQEDGneSEwHQYD
-VR0OBBYEFFSU9LIZC5KU6sNdN/eiXnguhT/8MA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBgBgNVHSAE
-WTBXMEsGCysGAQQBsjEBAgIaMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZ2Fu
-ZGkubmV0L2NvbnRyYWN0cy9mci9zc2wvY3BzL3BkZi8wCAYGZ4EMAQIBMDwGA1Ud
-HwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuZ2FuZGkubmV0L0dhbmRpU3RhbmRhcmRT
-U0xDQS5jcmwwagYIKwYBBQUHAQEEXjBcMDcGCCsGAQUFBzAChitodHRwOi8vY3J0
-LmdhbmRpLm5ldC9HYW5kaVN0YW5kYXJkU1NMQ0EuY3J0MCEGCCsGAQUFBzABhhVo
-dHRwOi8vb2NzcC5nYW5kaS5uZXQwLQYDVR0RBCYwJIIObm9yZGJpb21lZC5uZXSC
-End3dy5ub3JkYmlvbWVkLm5ldDANBgkqhkiG9w0BAQUFAAOCAQEADkQ7NDW2rUCc
-1duYsOiBOhzx9DFikpR7ceBqbWicfQPkPNkdeRMeSGyrc1/Laz+1vzmERnD2wNHk
-EwzIvfsGCF8gfELl+Gcef8CzLu8ilEHb+z2hjW1BsBYG6+TlfS1voekeVt8YfBvh
-WkbjgWGxjz+32+RnjiQsFG/acxbLDKAV3iuVMIQY5q9k7yppb+FnwyMOPVoJLDPY
-ZTMTNtz5xmKVfCHGSiyCrKPrHIk5s4JFDyfdLEjuW4oSBB4KM+Ztrkq1hSuE3s9y
-zsy1QQZKFOddPJgZM7PyUaFBCktdndZBXTYoRVTvhrCLr65Sqea89rshZnDa/umD
-CAKgw6g9qQ==</ds:X509Certificate>
+ <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIQTEIjMmXuufcFuvtWfJihPTANBgkqhkiG9w0BAQsFADBf
+MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
+DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
+HhcNMTUwNzE3MDAwMDAwWhcNMTYwODA4MjM1OTU5WjBdMSEwHwYDVQQLExhEb21h
+aW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAsTEkdhbmRpIFN0YW5kYXJkIFNT
+TDEbMBkGA1UEAxMSd3d3Lm5vcmRiaW9tZWQubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAls+xz8egoxxjFCKfIDzdVZHScL48GtfWfBAZafwuIJho
+dTmsbv9N5kbIm1uLh0GH+IuhEoJruOteMTe1m745IE9AoCluQPWzIfVaUjlc74YW
+QwJLHgaw6ZrzCA0ohP5SLHCOPJDv+1xAzlAumHmnsOw4mX7ea10Plot3SqMcO6rI
+zepln15pqPmmuo57X1jkpQREAKW59DqU5h2RecI56mdIgya3doPQxU3+C9dOMdDT
+z9tnp22IgGRnT1gkF8Ydi4QYFK0KDgLXoLWyuZt0V8N/OAjIGI0eEOjzdPup26k3
+WOvq70FzGpduv4FVPVu+fJjG7ifF0UZUh45yAQO2yQIDAQABo4IBtTCCAbEwHwYD
+VR0jBBgwFoAUs5Cn2MmvTs1hPJ98rV1/Qf1pMOowHQYDVR0OBBYEFCvesVl+fDPe
+JpcyFyNxkZ1Pew81MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBLBgNVHSAERDBCMDYGCysGAQQBsjEB
+AgIaMCcwJQYIKwYBBQUHAgEWGWh0dHBzOi8vY3BzLnVzZXJ0cnVzdC5jb20wCAYG
+Z4EMAQIBMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9jcmwudXNlcnRydXN0LmNv
+bS9HYW5kaVN0YW5kYXJkU1NMQ0EyLmNybDBzBggrBgEFBQcBAQRnMGUwPAYIKwYB
+BQUHMAKGMGh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9HYW5kaVN0YW5kYXJkU1NM
+Q0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTAt
+BgNVHREEJjAkghJ3d3cubm9yZGJpb21lZC5uZXSCDm5vcmRiaW9tZWQubmV0MA0G
+CSqGSIb3DQEBCwUAA4IBAQCODf9haiwN3O9XzB9V4MBPPcB0661YbNJo2N6rguEk
+v9JbToStcACbQ3V0xb2yulk/rgw50U7Qd8nJ7FJg60UfXJsPJbhY82JBK2cXBsUR
+aoxFqzTcOzeHsZzkHWCetMuJ3C2U7zJ7zlM5d00CKq4KUMPw4aIWa1ZVZzY6w7fk
+ygsKkxkMt53Bgz+kboZ2Za7f8+mI1WSwOXGZ7JZvA1silbYaWqAOP/Q2p0YTonc/
+cb9svLVNv1dY7g+DHfHECFu9SLjl/htYmWWoUtL/59m+nPGPmDL6I/rjdzGtVGXi
+PbMcpBprCNt05806/04coPb2RbK0VDV5DG00Z/kNoGxR</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 140acad8..00000000
--- a/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-31T11:24:50Z">
- <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">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6zCCAdOgAwIBAgIJAPx/LwmeUGTyMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
- BAMTDHd3dy5veC5hYy51azAeFw0xNDA3MjkwODExNTNaFw0yNDA3MjYwODExNTNa
- MBcxFTATBgNVBAMTDHd3dy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAOc2rOr/XaHUNhfWxfolloVnnDDY3BvIP/AWugahGYXEelclRaNX
- 95rh21w+Pw6qcMwkaCoc8LBNE2O7ReUp2zUWsB1t87w8v8XDUPEpPAQ9XVTHFGAt
- 4A93oYO8UuZPC6CoPu2guuXJT+gS5jiswk/R3729CUlphY/Ov9+QO1jfuoNu8mGY
- FllFALRsDKc8PH83UuEhF4R9rtz1LYoD/vs6NjR+n1dovkRMqxRZBxuEgcEX1tft
- WciPXI4Nk4DbbgOPgmcl0dPUK+IMTLLQF/So/qO02cxDZKp9DA+rws79J0qPOOUQ
- AaYqFjB8qRjKfs9xUrCviXNHzgWmLKbEUkUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
- d3d3Lm94LmFjLnVrMB0GA1UdDgQWBBRdot3++gHpLRLS+MGj/T9eobiBrjANBgkq
- hkiG9w0BAQUFAAOCAQEALUNCD99LKk+88GfsmMNIczRzOEQynKD1i5X6247/5zs+
- w81ezac3VrDk09O9PFhkeh4D32KupXWQ4+bY7ijlBj/BVDhrrgKZZeD5mu+J8Ru+
- Ypz4r7bV+t8dUukfNy6xLMqePEmrmhLgWql0EtOpRrsZC/GNdpkl+kJG3EoPt8cZ
- umV/wHnzjahIYYKQ2YyrwU6tT/jMDciNSZOEJOoVkujmhu3yK0eIwfAJQzJ90fGg
- t/KiRYU/XnfJ+HdgNOth5XvmNSG3gmzVtGVLbPbfp7i4sCHMOD5FzSziYwp6m6Pn
- Q9nQhuIfcxbBFG6jt794VKX50sAROXsVPFcYfT3gTg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml
deleted file mode 100644
index cd8ff382..00000000
--- a/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pbyp.co.uk/sp/shibboleth">
- <!--
- This is a "Personalisation by Pieces" Shibboleth SP for Cambridge Education Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T09:49:22Z"/>
- </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://pbyp.co.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pbyp.co.uk/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
- to teaching and learning developed by Cambridge Education in 2006. It is a
- framework to support personalised learning based on core skills and competencies.</mdui:Description>
- <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-logo.gif</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAJX1RdJ8skE0MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGm50ZGQzMDEzLXZtMDEuY2FtYmJlLmxvY2FsMB4XDTEyMDYxMzA1NDM0NloX
- DTIyMDYxMTA1NDM0NlowJTEjMCEGA1UEAxMabnRkZDMwMTMtdm0wMS5jYW1iYmUu
- bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeQA65YfW/dJ4n
- CcZdPN2415+xiP5HNH/iRXhfBTEr+QN5QP3z1ylRidTHWNz5S2e1HfTsbdPLJygj
- W7NxXLu6YFi79TopSUVCOpBEqOcXldR5YPtTRJtNProb5vUIP1iix1d9KoBPufsZ
- Y5kk9156EwA47C/HMFdV8y71yKbhojbSlKTvxdkaYkrB0YFbo125SMeJP/JnVW32
- WJ4+qVGQzzTGAV8/KTNOGovGj1uz8fJVAIBoIpJQAAuWq8Aoo8F135iHU4uiQROE
- 3jGs/iW0f2cdENQn5l0bCjnZmvnx5o/oIdvU0YjHaAMsjs8OUfg64o/kOQ4vq4y4
- iOUiQrTHAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDEzLXZtMDEuY2FtYmJl
- LmxvY2FsMB0GA1UdDgQWBBR7Na1DFuvXRKD/IWAWCFpXlM6NCTANBgkqhkiG9w0B
- AQUFAAOCAQEABwfDIGzHs+Np3N2BQUhvDMVz6aP4RS3Nqv9DsnyxBv3RkQJ6q+oB
- eESW5oQCgGRK0jlUSjFuc5liZA7KM6NcT32HuJOcFpTcKIffA3uKVNK5FScbr89O
- 8LpN3xxBeVbVlhHmj2LQ1hmB4DLikk/19F3J9amTthw6BIztTo3P5aT988eC8QOo
- i41vNMju3zx6tkO49RXCDLDcGd4hxIXrE/zeJzGSUdgOSZ3yahNzQyjwE3y1zFId
- C88bOQzKf/M2cgegVSbjJBhqTOIWYJsb62Jd3CTHaj7nkvZfv82B3UTxO9o2bvKD
- u2nA/TyhOJ/2oTDY+YdGCx3lJ8qykSVXow==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pbyp.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pbyp.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pbyp.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cambridge Education Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cambridge Education Limited Personalisation by Pieces</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.camb-ed.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Simon</GivenName>
- <SurName>Bell</SurName>
- <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Zishan</GivenName>
- <SurName>Sheikh</SurName>
- <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Simon</GivenName>
- <SurName>Bell</SurName>
- <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Zishan</GivenName>
- <SurName>Sheikh</SurName>
- <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
index 0cb363c9..2b5da972 100644
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
@@ -82,6 +82,8 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="8"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
diff --git a/swamid-interfederations-2.0/www.qoam.eu-.xml b/swamid-interfederations-2.0/www.qoam.eu-.xml
deleted file mode 100644
index 36d25bf3..00000000
--- a/swamid-interfederations-2.0/www.qoam.eu-.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qoam.eu/">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">QOAM - Quality Open Access Market</mdui:DisplayName>
- <mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
- <mdui:Logo width="65" height="65">https://static.surfconext.nl/media/sp/OAmarket.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</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>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-logout.php/qoam-wayf"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf/artifact" index="3"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">QOAM</md:ServiceName>
- <md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">QOAM</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">QOAM</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.qoam.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>info@qoam.eu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Leo</md:GivenName>
- <md:SurName>Waaijers</md:SurName>
- <md:EmailAddress>leowaa@xs4all.nl</md:EmailAddress>
- <md:TelephoneNumber>+31 24 36 17961</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 453cca26..00000000
--- a/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sbs.ox.ac.uk/shibboleth">
- <!--
- This is a "Said Business School" Shibboleth SP for University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-04T14:07:17Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAKtJW6P66mO4MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHd3dy5zYnMub3guYWMudWswHhcNMTMwOTAyMTQwNjUxWhcNMjMwODMxMTQw
- NjUxWjAbMRkwFwYDVQQDExB3d3cuc2JzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAmsdbrSCkH5ZFU6C2mwfXmWXdQRTzEXj2HSzcxvHQ
- gLX6fnB4f83GeMWRiZibJKlXqbl4FzXcpHD9jt6hjGIN5gO7cSdnuGXN9Uk0KFK3
- x+DvUxbxb4ZyHpJ/Zm+U740xMJrxmdT5yIpR4OqvZ5A8nmmVpHJWDhywoCv07nVD
- HtStOXw3uGJkGWBZbthhsT7kepw3JBQYsrIpGw+Dj+TZ95GJGKDF4Pw5i5erlVjr
- f3ZBzesK2Bd2NzVqPqVMasTwV48ea4r6I9HaPF3TrysTsiYWryXJI6IdHsUUx+LN
- KIksFW5t5jyV8wCvKnfqb0QAQeFbqXIe0SGvC/OKVSMkdwIDAQABoz4wPDAbBgNV
- HREEFDASghB3d3cuc2JzLm94LmFjLnVrMB0GA1UdDgQWBBTKEr4Z+YHBBfBATGJ3
- O0k9PamaNjANBgkqhkiG9w0BAQUFAAOCAQEAkj8zXH2bFg6ZIzQoFpjjW3hUiY6z
- eDChMmiy9TXhlXp33Sx8ojM90XulrieY0KWqKfssEvF1EFTqOybvp9AOxyh6FSJB
- QvafBExWMOxD9IscIQb9kx3jGOGp95NfhCE2Td3KDl5+LwRWJwxnKq1d1ApY6rLI
- MMa1T5eHs6IFSBq7twfZWDAOycSpp5uY0+k3TD736d1Hmdc+vlau5c43HHLA5qcS
- N4H/o5imvlkGpTRxpxgsYOezQnX05Cy64Lp1Hvagg1766ZTT3zKLSG3s175lnCQ5
- blf8Z3Cb7eBFE/7iAeAbOoyyvGjB+y/XQjWvXJwXkWTLlYrZna6PGQ+ocw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>NSMS Team</GivenName>
- <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Aaron</GivenName>
- <SurName>Wilson</SurName>
- <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index b5e4a01a..00000000
--- a/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sss.ox.ac.uk/shibboleth">
- <!--
- This is a "ESD Live Environment" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-01T16:42:00Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAOH4G+VuojucMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHd3dy5zc3Mub3guYWMudWswHhcNMTMwMTMxMTYyODE2WhcNMjMwMTI5MTYy
- ODE2WjAbMRkwFwYDVQQDExB3d3cuc3NzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAvBi0PwHPy7hLbzkt71L0SiFqPitwDSfQ2ZlL2YXk
- dmulWfUgojJEo6H0b3eM9tUA8P1IADnKOKjmNeKAa9HqE4kfB1lzYS9iV/4i2dis
- Zg3tqITFjaxhZ+2x5Jhr/tuqU568K9Dz3US9tVWQqNg+W/Wve1YGPYlv4e8UNVtl
- TBYMV5Dv6Cftnq4HdmhSirng5v/wQGTNREjfoiUHmD8ZZ6YwyAqpTlRCLQy1mNxT
- p7i/vpe+i35GoMITpH8ZKIVrJEXJKYA3npF0tdiPgd4We+Rn//yHDTWU1cltZ1It
- 9gqnsWN5dldcKMWGRKhd2M0hzPZTUGrV94AAOQhgc3WoUQIDAQABo1AwTjAtBgNV
- HREEJjAkghB3d3cuc3NzLm94LmFjLnVrhhB3d3cuc3NzLm94LmFjLnVrMB0GA1Ud
- DgQWBBQLYrqBm6zLEN3bNXHxocMiBRr9LTANBgkqhkiG9w0BAQUFAAOCAQEAHK7z
- mWgHDjQm7w7dXEQyeXEJ8xVW34UrSsZgt7uBy+1nxpbHzb09aNYUObfIvgRpAt1W
- 6Z67i2Jzjq4DqWeL2NpsCEgDm3eNO++Aw/uypNiA2PaVmXU//6m9uXIm+Chuq4Qy
- yD58hcy/W1nJ+EVYraWzY/a4nD6gujQgGttu6z5a8icIIAVOO1ipa47r1YbLo5y+
- m7NxcUKdhMANsSxVES4L9S/an+hztldZtSxCePBBcOOcRTFKpmbw2OFp384pjD5Y
- ECbSLCxnYuKCLtM99vOqVoSZrLvYURsFu7Xe6KH1rMwliAoPsuPQf9pZDhROoCYF
- oK7HZPfIVarlAW4SnQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - ESD Live Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jason</GivenName>
- <SurName>Harris</SurName>
- <EmailAddress>mailto:Jason.Harris@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 80c0e3d8..00000000
--- a/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.staffsubs.ox.ac.uk/shibboleth">
- <!--
- This is a "Staff Subscriptions Site" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-02T11:30:32Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAOFx/II0dT0qMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnd3dy5zdGFmZnN1YnMub3guYWMudWswHhcNMTQxMDAxMTI1MjE1WhcNMjQw
- OTI4MTI1MjE1WjAhMR8wHQYDVQQDExZ3d3cuc3RhZmZzdWJzLm94LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4HVi9g+ykcr2sPcI0wScBuFR
- 4u+dx+t043JTIIz0GoGUFCDGRvPkuFqWDdEXaqCCHn5fgQ+OV6a2N3WbJSorJvsA
- 1YOcwVyFew2CwWZmU4t6hlCrZObbhmdCBePXPBv06qge/3b6GviwaBINpEvuq8id
- sENNJVikDLJvGu8sDTc5qHEvGF5dGVHN6xYePwcDkuEha5gcgNa9SZERPY0tgM3N
- GbwO4+Vd1Jxz2G+UDKIaFjC/j6E47OWMNmy+gwUhZdIeYF0Z04GtLG5M/0dmgtqv
- 4tfTmMbDNRPQPrTW+0Y/OtmnG00KQWxq49syCsEAkpLIQ5TdJDobdVHbf0CWJwID
- AQABo0QwQjAhBgNVHREEGjAYghZ3d3cuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
- DgQWBBRPsi6qZ3/pP7C2K53aj3dcsZ8cuDANBgkqhkiG9w0BAQUFAAOCAQEAl9gw
- cJLhHS2jZkeys6V1MjVahhJ0yzwR2f/ZxljqMlDE+EVsFdYvZHqc9GyKy9aLUIi+
- wLnw9yZzLKUoV9Nj++so6/XW+gLb704S/bFY7/gFK1xB7/dVqwFIswBJE8gQbrrk
- jJ7xitSTzwe5JLUdsykCp9ydPOJN6a1O81zUnyFTzhdkqvjcm7+dow3hJ+LlVjLv
- ntGwu12fmBeGSRaM2pBXjOScD2Je9kMCRMDpfBFkpOnRLiVAYfzyHmCkEBgGTeYG
- mVFHI2Wocap0++wO3hcdrzQMUjLdo9vamBIGERZTpOZ1gYAnF645dq2kceKt7pI6
- oHBipfiT+f27wP8VHQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford Staff Subscriptions Site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ops Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rob</GivenName>
- <SurName>Hebron</SurName>
- <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 92a7b32b..00000000
--- a/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.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://www.studentsystem.ox.ac.uk/shibboleth">
- <!--
- This is a Shib 2.1 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFkjCCBHqgAwIBAgIJAKjDVvtOMyd+MA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0
- ZW0ub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFk
- bWluLm94LmFjLnVrMB4XDTEyMDMwNTEyMjM0M1oXDTIyMDMwMzEyMjM0M1owgdIx
- CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
- b3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVz
- aW5lc3MgU2VydmljZXMgYW5kIFByb2plY3RzMSMwIQYDVQQDExp3d3cuc3R1ZGVu
- dHN5c3RlbS5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxp
- c3QuYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQDqNGg54tTuSJwAJ11jkiN+ZGQPPTfw0akmyDLZsr8J4bg9VWMVdGGELR5mSG2O
- bKtei9yazwqLJMKdJb7AQqDq+fXnYiuMyIU1mnogwCS2abLZ1kvpdx2ajH2A58XG
- wt4F/JvZ8tgDYeU7zAydlZKqkYaSKmg+rEJBVqi60OZAkj1Tlvvv+NcfzK3S9hBR
- 5yrCaV9ShoakUhJijyke3nsI1dRcAh8WZQCLvItQGAPilp2TmLLH+4wZRH/xV6yE
- 0/hWHUr+AO1CuqgDRQnlWfEQWhpaGZTK2eMZsquXNibKeXG7+HQN8nvNwhK1QSCg
- cEGDGmMjqmm0yEDM7QNfnoSJAgMBAAGjggFnMIIBYzAJBgNVHRMEAjAAMCwGCWCG
- SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
- FgQUhUt5A5DKRLfeRmp3FQO28O07HfEwggEHBgNVHSMEgf8wgfyAFIVLeQOQykS3
- 3kZqdxUDtvDtOx3xoYHYpIHVMIHSMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hm
- b3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBv
- ZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQcm9qZWN0
- czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0ZW0ub3guYWMudWsxLzAtBgkqhkiG
- 9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggkAqMNW+04z
- J34wDQYJKoZIhvcNAQEFBQADggEBALnfPqYUF7KMTz7xRgBQYykNhHilX/aoSBjQ
- Fweaw6/bFUenm2ItcyLvbQav+XHfw3/EEGeY9XaJnNr4LK+eCnYwsbZi+1+4QpNy
- orLL5umOjbfCd3INB6RQ6AMduzgMR+gHlw1WiORMnux9mybEjV5TFs80xNe9meTh
- 7Eyn+gf1wrtDfgEg5H4S69o0DDyMPnHu1EhdFb3Ombbwdmhpf+DwGktSl/XTaequ
- duJB3GIBnEwBv2PsZtWslTqJNWyQSdBpSr3kuxbwjiFZ9Oy7YWb5CuqA1APETfHW
- d5gNVy5VMpjKL6KHcDbZovZtIcJxUbNbXuBBO1DW6DZUJc22Fao=
- </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>
- MIIFkjCCBHqgAwIBAgIJAKjDVvtOMyd+MA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0
- ZW0ub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFk
- bWluLm94LmFjLnVrMB4XDTEyMDMwNTEyMjM0M1oXDTIyMDMwMzEyMjM0M1owgdIx
- CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
- b3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVz
- aW5lc3MgU2VydmljZXMgYW5kIFByb2plY3RzMSMwIQYDVQQDExp3d3cuc3R1ZGVu
- dHN5c3RlbS5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxp
- c3QuYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQDqNGg54tTuSJwAJ11jkiN+ZGQPPTfw0akmyDLZsr8J4bg9VWMVdGGELR5mSG2O
- bKtei9yazwqLJMKdJb7AQqDq+fXnYiuMyIU1mnogwCS2abLZ1kvpdx2ajH2A58XG
- wt4F/JvZ8tgDYeU7zAydlZKqkYaSKmg+rEJBVqi60OZAkj1Tlvvv+NcfzK3S9hBR
- 5yrCaV9ShoakUhJijyke3nsI1dRcAh8WZQCLvItQGAPilp2TmLLH+4wZRH/xV6yE
- 0/hWHUr+AO1CuqgDRQnlWfEQWhpaGZTK2eMZsquXNibKeXG7+HQN8nvNwhK1QSCg
- cEGDGmMjqmm0yEDM7QNfnoSJAgMBAAGjggFnMIIBYzAJBgNVHRMEAjAAMCwGCWCG
- SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
- FgQUhUt5A5DKRLfeRmp3FQO28O07HfEwggEHBgNVHSMEgf8wgfyAFIVLeQOQykS3
- 3kZqdxUDtvDtOx3xoYHYpIHVMIHSMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hm
- b3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBv
- ZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQcm9qZWN0
- czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0ZW0ub3guYWMudWsxLzAtBgkqhkiG
- 9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggkAqMNW+04z
- J34wDQYJKoZIhvcNAQEFBQADggEBALnfPqYUF7KMTz7xRgBQYykNhHilX/aoSBjQ
- Fweaw6/bFUenm2ItcyLvbQav+XHfw3/EEGeY9XaJnNr4LK+eCnYwsbZi+1+4QpNy
- orLL5umOjbfCd3INB6RQ6AMduzgMR+gHlw1WiORMnux9mybEjV5TFs80xNe9meTh
- 7Eyn+gf1wrtDfgEg5H4S69o0DDyMPnHu1EhdFb3Ombbwdmhpf+DwGktSl/XTaequ
- duJB3GIBnEwBv2PsZtWslTqJNWyQSdBpSr3kuxbwjiFZ9Oy7YWb5CuqA1APETfHW
- d5gNVy5VMpjKL6KHcDbZovZtIcJxUbNbXuBBO1DW6DZUJc22Fao=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Oracle Student Systems</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Help OSS single sign on</GivenName>
- <EmailAddress>mailto:help_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Technical OSS single sign on</GivenName>
- <EmailAddress>mailto:technical_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index dbc68a77..00000000
--- a/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studentsystemdr.ox.ac.uk/shibboleth">
- <!--
- This is a "OSS Student tier DR Live" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-20T13:54:00Z">
- <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>
- <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.studentsystemdr.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFQjCCBCqgAwIBAgIJAOQhP/3zz2g2MA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czElMCMGA1UEAxMcd3d3LnN0dWRlbnRzeXN0
- ZW1kci5veC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVr
- MB4XDTEwMTAxOTE1MTA0NloXDTIwMTAxNjE1MTA0NlowgcYxCzAJBgNVBAYTAkdC
- MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
- ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
- ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
- LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Wv3CtiHdbvqih6Hu7CKKrRjNhmOn
- MewIs3DGuBwGUb/i5LRjX0o6AbtJk9azG7HhoUeKGrLVdtruHCUIuHLXd0c883bt
- 5MwzRC9YSA+/pSKxj2LcAvhCA2fNZ3C1hL053GD0ndKq0pNAiYPsj9tUWBJrN8wR
- huD+tx0ss+B4YXfFTsTblGcaXDzcXWdl/F41v0NUBWcfQ8dlfdJRuX/Usz7rejbD
- vsBgh5uSG4OZv+Eiu/W89yXNITV4h6Fg+0dcUfZniMFYyLIUku4luMlq7+iG72RD
- SULiuTY7Pz45IGE0e/RjkSwF7VtUMpMBqYg4UIKyHmDGFk3yGCN9myHpAgMBAAGj
- ggEvMIIBKzAdBgNVHQ4EFgQU7VlGiJb4IfSORwJ2tns3OPj6HSswgfsGA1UdIwSB
- 8zCB8IAU7VlGiJb4IfSORwJ2tns3OPj6HSuhgcykgckwgcYxCzAJBgNVBAYTAkdC
- MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
- ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
- ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
- LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQDkIT/9
- 889oNjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCM8HFwrwani+OZ
- WilKPwX0ZoePWdZx0z01h0MkUG/5KfnaIwYgelwayBDzZkNGXID7kR//1CK3zReT
- /8fqqF8dOBu3/mwzUIM+HTeJ7oZft2db07lAMMxceJh0r/iVfAYMbdb9GJLFGo6u
- jT8uJPMedmLdw0HGYhBgddzGCwQAxEXQj3f+z7tjmwFfxjm8mbeymsej1OI9vTXk
- KkB9vFHT7f2IXtUn0FcU7lfDFecUFZTy4ht9sFMcz7yxSuXdXcEK4WVtRsPEDtFl
- eZ5JwdaE7y7vnC0qdyme1Me2ojk43A4d5GvkAVP7tDEm6UmRNAM9zAq0JwhJZRCH
- B4rL+Zur
- </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>
- MIIFQjCCBCqgAwIBAgIJAOQhP/3zz2g2MA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czElMCMGA1UEAxMcd3d3LnN0dWRlbnRzeXN0
- ZW1kci5veC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVr
- MB4XDTEwMTAxOTE1MTA0NloXDTIwMTAxNjE1MTA0NlowgcYxCzAJBgNVBAYTAkdC
- MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
- ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
- ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
- LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Wv3CtiHdbvqih6Hu7CKKrRjNhmOn
- MewIs3DGuBwGUb/i5LRjX0o6AbtJk9azG7HhoUeKGrLVdtruHCUIuHLXd0c883bt
- 5MwzRC9YSA+/pSKxj2LcAvhCA2fNZ3C1hL053GD0ndKq0pNAiYPsj9tUWBJrN8wR
- huD+tx0ss+B4YXfFTsTblGcaXDzcXWdl/F41v0NUBWcfQ8dlfdJRuX/Usz7rejbD
- vsBgh5uSG4OZv+Eiu/W89yXNITV4h6Fg+0dcUfZniMFYyLIUku4luMlq7+iG72RD
- SULiuTY7Pz45IGE0e/RjkSwF7VtUMpMBqYg4UIKyHmDGFk3yGCN9myHpAgMBAAGj
- ggEvMIIBKzAdBgNVHQ4EFgQU7VlGiJb4IfSORwJ2tns3OPj6HSswgfsGA1UdIwSB
- 8zCB8IAU7VlGiJb4IfSORwJ2tns3OPj6HSuhgcykgckwgcYxCzAJBgNVBAYTAkdC
- MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
- ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
- ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
- LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQDkIT/9
- 889oNjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCM8HFwrwani+OZ
- WilKPwX0ZoePWdZx0z01h0MkUG/5KfnaIwYgelwayBDzZkNGXID7kR//1CK3zReT
- /8fqqF8dOBu3/mwzUIM+HTeJ7oZft2db07lAMMxceJh0r/iVfAYMbdb9GJLFGo6u
- jT8uJPMedmLdw0HGYhBgddzGCwQAxEXQj3f+z7tjmwFfxjm8mbeymsej1OI9vTXk
- KkB9vFHT7f2IXtUn0FcU7lfDFecUFZTy4ht9sFMcz7yxSuXdXcEK4WVtRsPEDtFl
- eZ5JwdaE7y7vnC0qdyme1Me2ojk43A4d5GvkAVP7tDEm6UmRNAM9zAq0JwhJZRCH
- B4rL+Zur
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Student tier DR Live</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c7929bc7..00000000
--- a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studsys.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 'Student System' SP owned by the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMCR0Ix
- FDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoT
- FFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEdMBsG
- A1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10
- ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrMB4XDTEyMDkxNDEwMzE1NVoXDTMy
- MDkwOTEwMzE1NVowgbkxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
- ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
- ZDEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHd3dy5zdHVkc3lzLm94
- LmFjLnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5v
- eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeAGPAZmoFV
- jI0SuVzqP6xQA6FpqzrcwNF/iNN5OODL1ulgvGQOi3g8ThAoeYk0dO19pDhGd/86
- 44D8rXesekGWhUzP+Ww/8DjSJsaSUWq4leXcqYDcF8j8cgcHffUT3XLphZmI9DmU
- 1lLmkz7I6Oylgfx+ZZ+NtrL3y/JJWtUwF9x1LRwR6T+/eJXxnw4fxzfo5ndEHFhl
- 5/659TaCImKBm3g9aOOg1Wmnx0C+vpC14wY8NUoQVHN4gqq/jH5TXYtdm96ZJyLU
- NzoXn3feSbMdUERSagvwJLbSM32W5i5jm7yyunKMUDYuDNpnJrA7RBgWc5K6rB34
- SSBeNcRCODUCAwEAAaOCARowggEWMB0GA1UdDgQWBBSlpmuzhZ+Foz77+wtzD+j3
- THbupzCB5gYDVR0jBIHeMIHbgBSlpmuzhZ+Foz77+wtzD+j3THbup6GBv6SBvDCB
- uTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZP
- eGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJ
- VCBTZXJ2aWNlczEdMBsGA1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkq
- hkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggEAMAwG
- A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAE7kCZ+U1ggqaC+4uVyB0f3c
- YWRc9G4voJrN+RhYYCB8QfFaV6Z8VHV8jgJHYvBQVSz90lJkPI3Y7zxj3hx7/k8u
- 3dQSrYS1oAAao6+LtdDTldPa9JL2WWtO5cbHT2em5eoRmALFawru+kzcFkG/xzUU
- Syx3Mmypm4vOJPylzk4XMnINdn1WeHc5uuQfxo7/JeItYO5i9dSQ2xII8bsREhp+
- NfrvBYnZJLqjqjxturZlrCC9GHb8FBl82Go0Ms4ZK3U388O6lWrNTuwS/tY26tla
- 2yob86I5X9ytflI0zaH8qhvHelwbRG3PKepXpvAKiMDU2UzP2FOcvOn+NN612O0=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: Student System</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ops</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 80dd1ced..00000000
--- a/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studsysdr.ox.ac.uk/shibboleth">
- <!--
- This is a "OSS Staff tier DR Live" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-20T13:54:00Z">
- <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>
- <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.studsysdr.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
- eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
- MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
- VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
- ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
- IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
- KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
- ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
- J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
- ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
- AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
- 26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
- HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
- ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
- eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
- IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
- Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
- AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
- MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
- mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
- N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
- 9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
- 58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
- Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
- </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>
- MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
- eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
- MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
- VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
- ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
- IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
- KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
- ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
- J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
- ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
- AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
- 26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
- HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
- ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
- eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
- IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
- Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
- AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
- MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
- mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
- N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
- 9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
- 58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
- Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Staff tier DR Live</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
index 0d835496..6475b7f9 100644
--- a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
@@ -225,4 +225,9 @@
<SurName>Menon</SurName>
<EmailAddress>mailto:shoba.menon@arrkgroup.com</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Sudheer</GivenName>
+ <SurName>Kancherla</SurName>
+ <EmailAddress>mailto:sudheer.kancherla@arrkgroup.com</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
index d3bd30d6..f1a244ac 100644
--- a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
@@ -235,4 +235,9 @@
<SurName>Menon</SurName>
<EmailAddress>mailto:shoba.menon@arrkgroup.com</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Sudheer</GivenName>
+ <SurName>Kancherla</SurName>
+ <EmailAddress>mailto:sudheer.kancherla@arrkgroup.com</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
index 0bc18272..d092cce0 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
@@ -33,9 +33,9 @@
<ds:KeyName>vportal.niif.hu</ds:KeyName>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<md:NameIDFormat>undefined</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
diff --git a/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
deleted file mode 100644
index 9748ac95..00000000
--- a/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wwwtest.york.ac.uk/shibboleth">
- <!--
- This is a test Shibboleth 2.3.1 SP for the University of York
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
- NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
- BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
- x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
- zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
- 6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
- mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
- HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
- R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
- LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
- x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
- uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
- DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
- 4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
- Ig==
- </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>
- MIIC/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
- NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
- BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
- x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
- zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
- 6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
- mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
- HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
- R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
- LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
- x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
- uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
- DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
- 4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
- Ig==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of York</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of York: Test version of main York website</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.york.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>User Support</GivenName>
- <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Technical Support</GivenName>
- <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 56aecfdc..00000000
--- a/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://x5-poc.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a 'X5 Proof of Concept Environment' Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T12:29:44Z"/>
- </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://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAMdr2z4/Liv2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE3g1LXBvYy5ic3Aub3guYWMudWswHhcNMTIwNTE4MTQ1NzQwWhcNMjIwNTE2
- MTQ1NzQwWjAeMRwwGgYDVQQDExN4NS1wb2MuYnNwLm94LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtqQqj6F4saV794vfadGlVcOtJ/heiGE8
- TJJrh7/eHH60AzhleK1NJh/NFunFslWEaIoqOE6SlgZe+NypsanyaGo3ygQHxXba
- 4Vq6dzvOj1LRF6YxA29AMtF8vSTcxKNnKnpa4OimrIIifVZrt0vCxnBvylmfGiQz
- zQXdEcKVeaaVne+j1oO8eKqbFBV/p4DKKmdLJykMDRhSnx1wO8n4y/Xhojc0OgFl
- Ou+y9vzPOIfvDyKZM02WpVJwec9TJFrYoNecjhcJk/mKkVf1sH6YeBlqbtb2AaZO
- FWZAKFOuqr3JGqNVmz7d6S64i96oT1sljJp0LAHTKgPlPtLTXn4TPQIDAQABo1Yw
- VDAzBgNVHREELDAqghN4NS1wb2MuYnNwLm94LmFjLnVrhhN4NS1wb2MuYnNwLm94
- LmFjLnVrMB0GA1UdDgQWBBSX8k+Umv4AqD325y80eaY9ha72TDANBgkqhkiG9w0B
- AQUFAAOCAQEAOSdfNDLlhZvQcNwLb59aEbtIwUoCGpGP5ky2xPsKpaqnP9HUjzDu
- 9fqcQn4Uwfd/YTIMrvOerS1va77Z7BG6y6KISDfsHz/hZZYAgUWSAtGRyqGX0Czm
- kVGgg6ASKtS7xje/JMYfJqwGimQG1nTKNIXs/YuMletUOxc9gUUJLyEMo26Eg7ac
- a0FFxRRMcq9opIQl4EfXb7M6F7MMDwlP9o1ZZXh93oW32qyl5S+3NaRhUrnapRSC
- TjPbpaP3feSUwE1wNVX0bznzNvnUR8Zov+/ZP6RtdsogtRjHJcIoEjhMaA+dLl8e
- AWNCOFrJI/ZEstVwoK3oUpt8kPGT1PrDtg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: X5 Proof of Concept Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Nick</GivenName>
- <SurName>Letellier</SurName>
- <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ee95e87f..00000000
--- a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://x5-qa.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shibboleth X5 QA Environment SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-23T09:48:29Z"/>
- </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://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDETCCAfmgAwIBAgIJALT+QUXBSZeDMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEng1LXFhLmJzcC5veC5hYy51azAeFw0xMjEwMTkwOTQwMTJaFw0yMjEwMTcw
- OTQwMTJaMB0xGzAZBgNVBAMTEng1LXFhLmJzcC5veC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAKEKyMazhRGGodfwZDljiQZOKgx73F7nJpR1
- OotpgBlUw06aUI8ayaz38THfi3HeEcbqMrVWo/gO9l/hrbtqTzQ6pW39204BKoyv
- aeiT3y7Zox8Dn6tjJUsOVFMVCy4hDLoJ577IdL3yX42zeGsbLkzvGJcJ2C4HsW1m
- FXWFUv1fSKm76W/cFQF0HuJ1hCZ8DOcnpoAmokE0jPerGbRKWJewQ3+xaB7SNqp9
- icNxIzOmnd4eFFxP/6veM3ckBF1bbWAOB1fQRBdGK24JQMIC9J/ibuwf/QTMzD2i
- iBjVCIDnILrVdBbSLtVmKNMFZOK2sBiL7IYuXtuoIWf9RWh1zvECAwEAAaNUMFIw
- MQYDVR0RBCowKIISeDUtcWEuYnNwLm94LmFjLnVrhhJ4NS1xYS5ic3Aub3guYWMu
- dWswHQYDVR0OBBYEFMjXSu1rl1SQXLkzWctcqzz3VhapMA0GCSqGSIb3DQEBBQUA
- A4IBAQAhPszsE9vpMD9xqO6tnXMzEDRHeubZQRfpUUq3Wu/YAGEnZkmA0dAtlvPX
- V5QxXhK9IGLYrxLuwlOzgowb001uyvxxqhbTdAFmKB7wabWLnBg/8SJpDBp6sBMe
- fa4OJ3NZ17FN/EkXtp9VDQO992x8OsFYwZcLrHxBaQqC9lcCskIm04b5AQUc8STU
- MwNUAkof7SVjRHh6YDDJ1rm8GteKWMgzsoArLLRKtPpOXRHxKWwnbO2zrkK6cUO5
- M3orN7xlXTBbSgM6UXtpTyXPXDf7GbwhN6q0dhHN0+YZY9mr0L2dq6Detym7fOVF
- dOSjq/lxxyKOR4Ey9R9suqDKD1EB
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - X5 QA Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Malin</SurName>
- <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 100f69ed..00000000
--- a/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://x5.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a "X5 Live Environment" Shibboleth SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-29T15:16:45Z"/>
- </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://x5.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBTCCAe2gAwIBAgIJAMmy4gd9Qw27MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
- BAMTD3g1LmJzcC5veC5hYy51azAeFw0xMzAxMjUxNTAwNTlaFw0yMzAxMjMxNTAw
- NTlaMBoxGDAWBgNVBAMTD3g1LmJzcC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAOFtH+ma1qU5/TPtzKAw6kjCFpZo460ST1gggaVG1gHg
- rHSiXf5G53yk5yG4BNFYAj2TFa0aJBJM+JFHMLRxI1A96EZcLYasi4r2yShxd9r6
- 0yeZKxp2ljKOy28B7u6gfML+14ReEbPVVs+yFIjCwTP4Igs93AwTYLDQeo8TuDFI
- 112MXK9aod7rAAQlwhxFuge3+BaXAyENiMUxAJ+4g4efgGGoQMAxSw3USt1FJAtx
- FMs6Ei2MC86gvdgEaukQxV9sF3tDYI6yfi7gJD3F39xplIljacz9z/fs1zwCV8CD
- tmhubbNyPxxp1fq3x177UCXyvGDT/E1ChVqgwhfVWM0CAwEAAaNOMEwwKwYDVR0R
- BCQwIoIPeDUuYnNwLm94LmFjLnVrhg94NS5ic3Aub3guYWMudWswHQYDVR0OBBYE
- FFZISugxUOdaP19x8/pT/4sdzlP4MA0GCSqGSIb3DQEBBQUAA4IBAQCw5dR+3EKz
- 1sfuEvuI/fYOEHs81jR7PJyvPSt4pIgeDo+m3TxHg9vaoFt9fp3NHGkxYZ+6Qtkr
- YySBeZqK5UvzABWOuiQz8KAV0Mszpviq+4lfOPLzlzaMhhARaoYAbrI+swsaBUU3
- sfCX4Mmafa9YAvR9dps3qU0IKV4IVgtWnSMdUGItfLYWGYvlKiIAOO0xlMhvePgM
- ARFRTzU8SdMVEwAsweXn0M1EVugrJJilALPCqkBvA843J0QnGS8IpT0s+4r6WeO2
- ZJLbXz5vPPbE/bi5SJyjQdaOT6V2r2gvdedt1jvB2NQSWW85QktE3yAvxmLXGoyJ
- ngpHHGJFadEq
- </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://x5.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford - X5 Live Environment</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jason</GivenName>
- <SurName>Harris</SurName>
- <EmailAddress>mailto:Jason.Harris@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
index 66b3e210..3cb857bc 100644
--- a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
@@ -41,37 +41,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEMTCCAxmgAwIBAgIRANJmy62dRlQsRbM9eBFfwaUwDQYJKoZIhvcNAQEFBQAw
- SDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9u
- MRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTAeFw0xMjA3MjUwNzM2NDFaFw0xNTA4
- MjYwOTAxMTZaMHExGDAWBgNVBAMUDyoueHBlcnRoci5jby51azEPMA0GA1UEBxMG
- U3V0dG9uMQ8wDQYDVQQIEwZTdXJyZXkxCzAJBgNVBAYTAkdCMSYwJAYDVQQKEx1S
- ZWVkIEJ1c2luZXNzIEluZm9ybWF0aW9uIEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
- ggEPADCCAQoCggEBAMgoLbdAtISqHU+dde46IYDoRyBmip0Mlgo/zLl/sg/gJlEr
- bbhQTtOAFzzmS5E8H8gsCmz8gDu+oCoXfAMHN46AAG0jF/rked1kJRn9rYCTq04f
- /rfVO/VBQ7zqQG4Vi9dcH6ujY6osH1VECtvjxxcM7ClAeK5TdLfF87+hX32HHreQ
- W/BhmmeDSlr4uZA8zayUDC4XiTc4xV8TymY4+ugYCPX23x+h+O0WTp8I7mCpwvmm
- 2YL+RFH27ic+nyM2fsX9HAtyLr9sRGajY0F4kDVPjg7F1/NY8q4NY6/gyvZBUrDg
- zhYrvfuVSt0On8oNayiywOVvri8CA4OnNv85XocCAwEAAaOB7DCB6TAJBgNVHRME
- AjAAMB0GA1UdDgQWBBRoBK5/7uoq1WJ2Un4zCuOYYWmKCjAfBgNVHSMEGDAWgBRC
- MrYW+gT9/l1LesP990xAHVpDrzALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYB
- BQUHAwEwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5j
- b20vU1RDQS5jcmwwRAYDVR0gBD0wOzA5BgxghkgBhv1kAQECAwEwKTAnBggrBgEF
- BQcCARYbaHR0cDovL3NzbC50cnVzdHdhdmUuY29tL0NBMA0GCSqGSIb3DQEBBQUA
- A4IBAQBA3ueO9F9vI4eJb8trFi90caKoxvQ77Kwb5sOI1dQ8V8G4ZkzdDErZk0R2
- GoJNUBSisafG04hEeF67v+SwJLx7Ye7V+wVFgrl3ux6PvaBcwEmaI43cUSVHoHDm
- M0EYhrObf103NP8ecuzf2gu15uQt8uxId0CJJRdkis+Mq7JMM1aI40lcKZtBZMC0
- k013yqpgBpqjDxGKgpWjzyI/uWDuXAQw58WP3MOSRUU/Um6cXwTKqjAatfrIrhf0
- Bp7+ojPob81sAJqxNbAGbXvZLGS0U/juaLi7aNje+DnqwUkQIpVnVtE5n2HLvkbh
- qgB6j/wEdhppfAvFEntHvow73izn
- </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://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="1" isDefault="true"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="2"/>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml
deleted file mode 100644
index 6f50e52c..00000000
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
- <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
- <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-</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>
-MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
- <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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="false"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
- <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
- <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:SurName>Massimo Del Sarto</md:SurName>
- <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
index 8ce8169b..7e3400e8 100644
--- a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
@@ -4,16 +4,30 @@
This is a "Zetoc" Shibboleth SP for The University of Manchester.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-07T14:00:37Z"/>
+ <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="2013-03-07T14:00:37Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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://zetoc.jisc.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zui.mimas.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/Login"/>
<idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zetoc.jisc.ac.uk/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://zui.mimas.ac.uk/Shibboleth.sso/Login" index="2"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/Login" index="3"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Zetoc</mdui:DisplayName>
<mdui:Description xml:lang="en">The monitoring and search service for global research publications</mdui:Description>
@@ -50,10 +64,17 @@
</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://zetoc.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zui.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
@@ -64,18 +85,6 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zui.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zui.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zui.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zui.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zui.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zui.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e4440505..f6173077 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -118,7 +118,6 @@
<xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/connect-test.sunet.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/converis.info-shibboleth.xml"/>
- <xi:include href="swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/samadhi.kib.ki.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/tcs-test.sunet.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -208,7 +207,6 @@
<xi:include href="swamid-2.0/betafoo.nordu.net-saml2-metadata.xml"/>
<xi:include href="swamid-2.0/vfu-test.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/vfu.su.se-shibboleth.sso.xml"/>
- <xi:include href="swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
<xi:include href="swamid-2.0/mds2.nordu.net-shibboleth.xml"/>
<xi:include href="swamid-2.0/cdn.nordunet.tv-shibboleth.xml"/>
@@ -432,7 +430,7 @@
<xi:include href="swamid-2.0/brandkeeper.se-wsfed.xml"/>
<xi:include href="swamid-2.0/dev.nais.uhr.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/www.ate.resultat.ladok.se-gui-sp.xml"/>
- <xi:include href="swamid-2.0/hig.blackboard.com-shibboleth-sp.xml"/>
+ <xi:include href="swamid-2.0/lms.hig.se-shibboleth-sp.xml"/>
<xi:include href="swamid-2.0/pera.cs.lth.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/se.timeedit.net-saimia-generic-sp.xml"/>
<xi:include href="swamid-2.0/openarchive.ki.se-shibboleth.xml"/>
@@ -454,4 +452,7 @@
<xi:include href="swamid-2.0/test.bils.se-auth-metadata.xml"/>
<xi:include href="swamid-2.0/luvit.ced.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/luvittest.ced.lu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml"/>
+ <xi:include href="swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml"/>
+ <xi:include href="swamid-2.0/daisy.ict.kth.se-shibboleth.xml"/>
</md:EntitiesDescriptor>