summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HEADER.html36
-rw-r--r--bootstrap/css/bootstrap.min.css6
-rw-r--r--bootstrap/fonts/glyphicons-halflings-regular.eotbin0 -> 20127 bytes
-rw-r--r--bootstrap/fonts/glyphicons-halflings-regular.svg288
-rw-r--r--bootstrap/fonts/glyphicons-halflings-regular.ttfbin0 -> 45404 bytes
-rw-r--r--bootstrap/fonts/glyphicons-halflings-regular.woffbin0 -> 23424 bytes
-rw-r--r--bootstrap/fonts/glyphicons-halflings-regular.woff2bin0 -> 18028 bytes
-rw-r--r--swamid-interfederations-1.0/idp.feide.no.xml2
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0.mxml73
-rw-r--r--swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml56
-rw-r--r--swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml154
-rw-r--r--swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml135
-rw-r--r--swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml107
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml87
-rw-r--r--swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml78
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml58
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml66
-rw-r--r--swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml96
-rw-r--r--swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml82
-rw-r--r--swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml84
-rw-r--r--swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml84
-rw-r--r--swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml141
-rw-r--r--swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml117
-rw-r--r--swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml70
-rw-r--r--swamid-interfederations-2.0/europe-stage.wiseflow.net.xml5
-rw-r--r--swamid-interfederations-2.0/europe.wiseflow.net.xml5
-rw-r--r--swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml49
-rw-r--r--swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml51
-rw-r--r--swamid-interfederations-2.0/fod.geant.net-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml14
-rw-r--r--swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml6
-rw-r--r--swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml16
-rw-r--r--swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml20
-rw-r--r--swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml218
-rw-r--r--swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml2
-rw-r--r--swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml126
-rw-r--r--swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml48
-rw-r--r--swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml43
-rw-r--r--swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml209
-rw-r--r--swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml66
-rw-r--r--swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml76
-rw-r--r--swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml100
-rw-r--r--swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml210
-rw-r--r--swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml137
-rw-r--r--swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml80
-rw-r--r--swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml53
-rw-r--r--swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml98
-rw-r--r--swamid-interfederations-2.0/login.emerson.edu-idp.xml65
-rw-r--r--swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml136
-rw-r--r--swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml107
-rw-r--r--swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml47
-rw-r--r--swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml70
-rw-r--r--swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/saml.edusafe.nordu.net.xml5
-rw-r--r--swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml5
-rw-r--r--swamid-interfederations-2.0/saml.lynda.com.xml80
-rw-r--r--swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml55
-rw-r--r--swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml230
-rw-r--r--swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml40
-rw-r--r--swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml125
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml44
-rw-r--r--swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml117
-rw-r--r--swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml122
-rw-r--r--swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml98
-rw-r--r--swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml2
-rw-r--r--swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/sp.www.kielipankki.fi.xml22
-rw-r--r--swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml106
-rw-r--r--swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml149
-rw-r--r--swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml2
-rw-r--r--swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml4
-rw-r--r--swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml43
-rw-r--r--swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml88
-rw-r--r--swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml2
-rw-r--r--swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml2
-rw-r--r--swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml128
-rw-r--r--swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml99
-rw-r--r--swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml2
-rw-r--r--swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml26
-rw-r--r--swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml81
-rw-r--r--swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml5
-rw-r--r--swamid-logo-3.pngbin0 -> 98518 bytes
210 files changed, 4427 insertions, 5249 deletions
diff --git a/HEADER.html b/HEADER.html
index e8649661..082d6123 100644
--- a/HEADER.html
+++ b/HEADER.html
@@ -1,20 +1,38 @@
-<style>
- #container { width: 800; }
-</style>
-<div id="container">
-<img src="sunet-swamid.png">
-<h1>NOTE WELL</h1>
-<p>The contents of this directory is explained in detail at <a href="http://www.swamid.se">www.swamid.se</a>. In order to use any of these files you must either be a member of SWAMID or accept the <a href="swamid-tou-sv.txt">SWAMID Metadata Terms of Use</a>(<a href="swamid-tou-en.txt">en</a>).</p>
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+ <title>Bootstrap 101 Template</title>
+
+ <!-- Bootstrap -->
+ <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
+ <style>
+ .logo {
+ width: 25%;
+ }
+ </style>
+ </head>
+ <body>
+ <div class="container">
+ <div class="page-header">
+ <img class="logo" src="swamid-logo-3.png">
+ </div>
+ <div class="alert alert-info">
+ <p><i class="glyphicon glyphicon-exclamation-sign"></i>&nbsp;<strong>Note Well</strong>&nbsp;The contents of this directory is explained in detail at <a class="alert-link" href="http://www.swamid.se">www.swamid.se</a>. In order to use any of these files you must either be a member of SWAMID or accept the <a class="alert-link" href="swamid-tou-sv.txt">SWAMID Metadata Terms of Use</a>(<a class="alert-link" href="swamid-tou-en.txt">en</a>).</p>
+ </div>
<h2>Signing Key</h2>
-<p>SWAMID metadata is signed with the key found in <a href="md-signer.crt">md-signer.crt</a> which has SHA1 fingerprint 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB</p>
+<p>SWAMID metadata is signed with the key found in <a href="md-signer.crt">md-signer.crt</a> which has SHA1 fingerprint <pre>12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB</pre></p>
<h2>Production Metadata</h2>
<p>
These are metadata feeds to be consumed by SWAMID members and relying parties:
</p>
-<dl>
+<dl class="dl-horizontal">
<dt><b>swamid-2.0</b></dt><dd>SWAMID version 2.0 main metadata feed.</dd>
<dt><b>swamid-idp</b></dt><dd>Aggregate of all SWAMID 2.0 registered identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with identity providers in the <b>local</b> SWAMID ring of trust.</dd>
<dt><b>swamid-idp-transitive</b></dt><dd>Aggregate of all SWAMID 2.0 and SWAMID interfederation identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with the full set of identity providers in the <b>full transitive</b> SWAMID ring of trust.</dd>
diff --git a/bootstrap/css/bootstrap.min.css b/bootstrap/css/bootstrap.min.css
new file mode 100644
index 00000000..4cf729e4
--- /dev/null
+++ b/bootstrap/css/bootstrap.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
+/*# sourceMappingURL=bootstrap.min.css.map */ \ No newline at end of file
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.eot b/bootstrap/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 00000000..b93a4953
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.svg b/bootstrap/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 00000000..94fb5490
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
+<glyph unicode="&#x2000;" horiz-adv-x="650" />
+<glyph unicode="&#x2001;" horiz-adv-x="1300" />
+<glyph unicode="&#x2002;" horiz-adv-x="650" />
+<glyph unicode="&#x2003;" horiz-adv-x="1300" />
+<glyph unicode="&#x2004;" horiz-adv-x="433" />
+<glyph unicode="&#x2005;" horiz-adv-x="325" />
+<glyph unicode="&#x2006;" horiz-adv-x="216" />
+<glyph unicode="&#x2007;" horiz-adv-x="216" />
+<glyph unicode="&#x2008;" horiz-adv-x="162" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="325" />
+<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
+<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
+<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
+<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
+<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
+<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
+<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
+<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
+<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
+<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
+<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
+<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
+<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
+<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
+<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
+<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
+<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
+<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
+<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
+<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
+<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
+<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
+<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
+<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
+<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
+<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
+<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
+<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
+<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
+<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
+<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
+<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
+<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
+<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
+<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
+<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
+<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
+<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
+<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
+<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
+<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
+<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
+<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
+<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
+<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
+<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
+<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
+<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
+<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
+<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
+<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
+<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
+<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
+<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
+<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
+<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
+<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
+<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
+<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
+<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
+<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
+<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
+<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
+<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
+<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
+<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
+<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
+<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
+<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
+<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
+<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
+<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
+<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
+<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
+<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
+<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
+<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
+<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
+<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
+<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
+<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
+<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
+<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
+<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
+<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
+<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
+<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
+<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
+<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
+<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
+<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
+<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
+<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
+<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
+<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
+<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
+<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
+<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
+<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
+<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
+<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
+<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
+<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
+<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
+<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
+<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
+<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
+<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
+<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
+<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
+</font>
+</defs></svg> \ No newline at end of file
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.ttf b/bootstrap/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 00000000..1413fc60
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.woff b/bootstrap/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 00000000..9e612858
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/bootstrap/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 00000000..64539b54
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index e7b15bb0..a1e6388b 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -200,8 +200,10 @@
<shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hof.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">holmestrand.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 4cd28100..8f5c8259 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -127,6 +127,6 @@
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 7dcbed43..6072f4e4 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -12,7 +12,7 @@
<xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.insel.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
@@ -25,6 +25,7 @@
<xi:include href="swamid-interfederations-2.0/aai-logon.hcmr.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml"/>
@@ -47,6 +48,7 @@
<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"/>
+<xi:include href="swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/activation.glew.org.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml"/>
@@ -249,7 +251,6 @@
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml"/>
@@ -320,6 +321,7 @@
<xi:include href="swamid-interfederations-2.0/cafe.ufcspa.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml"/>
@@ -341,7 +343,6 @@
<xi:include href="swamid-interfederations-2.0/cascade.accessiblelearning.com-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.conncoll.edu-idp-shibboleth.xml"/>
-<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/cassiopee.ac-nice.fr-idp-shibboleth.xml"/>
@@ -452,7 +453,6 @@
<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/dl.acm.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dldev.acm.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
@@ -500,15 +500,14 @@
<xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/eduroam.frizerska.si.xml"/>
<xi:include href="swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml"/>
<xi:include href="swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
@@ -558,7 +557,6 @@
<xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml"/>
<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.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"/>
@@ -574,7 +572,6 @@
<xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
@@ -596,7 +593,6 @@
<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fed-interop-wg.ligo.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.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"/>
@@ -610,11 +606,9 @@
<xi:include href="swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fod.geant.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
<xi:include href="swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
@@ -693,6 +687,7 @@
<xi:include href="swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
@@ -756,7 +751,6 @@
<xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml"/>
@@ -787,10 +781,6 @@
<xi:include href="swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.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"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml"/>
@@ -971,6 +961,7 @@
<xi:include href="swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml"/>
@@ -1090,6 +1081,7 @@
<xi:include href="swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
@@ -1191,7 +1183,6 @@
<xi:include href="swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml"/>
@@ -1250,6 +1241,7 @@
<xi:include href="swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml"/>
@@ -1259,6 +1251,7 @@
<xi:include href="swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.port.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml"/>
@@ -1314,7 +1307,6 @@
<xi:include href="swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml"/>
@@ -1334,7 +1326,6 @@
<xi:include href="swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml"/>
@@ -1448,6 +1439,7 @@
<xi:include href="swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml"/>
@@ -1641,7 +1633,6 @@
<xi:include href="swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/janus.cnrs.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml"/>
@@ -1650,7 +1641,6 @@
<xi:include href="swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml"/>
@@ -1680,7 +1670,6 @@
<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml"/>
<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/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.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"/>
@@ -1712,14 +1701,12 @@
<xi:include href="swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.emerson.edu-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.fhv.at-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.figshare.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.figsh.com-shibboleth.xml"/>
@@ -1731,6 +1718,7 @@
<xi:include href="swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.justis.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml"/>
@@ -1859,7 +1847,6 @@
<xi:include href="swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml"/>
<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"/>
@@ -1875,8 +1862,6 @@
<xi:include href="swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
@@ -1887,7 +1872,6 @@
<xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.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"/>
@@ -1910,6 +1894,7 @@
<xi:include href="swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ppms.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml"/>
@@ -1997,6 +1982,7 @@
<xi:include href="swamid-interfederations-2.0/saml.edusafe.qalab.geant.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/saml.lynda.com.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.nelnet.net.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"/>
@@ -2055,9 +2041,7 @@
<xi:include href="swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml"/>
@@ -2112,6 +2096,7 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml"/>
@@ -2121,7 +2106,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml"/>
@@ -2190,7 +2174,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml"/>
<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"/>
@@ -2208,7 +2191,6 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml"/>
@@ -2318,7 +2300,6 @@
<xi:include href="swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml"/>
@@ -2336,11 +2317,9 @@
<xi:include href="swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.lexisnexis.com.xml"/>
<xi:include href="swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
@@ -2368,7 +2347,6 @@
<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"/>
<xi:include href="swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml"/>
@@ -2526,6 +2504,7 @@
<xi:include href="swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml"/>
@@ -2536,7 +2515,6 @@
<xi:include href="swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml"/>
<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.ecu.edu-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.educause.edu-sp.xml"/>
@@ -2606,6 +2584,7 @@
<xi:include href="swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml"/>
<xi:include href="swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml"/>
<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"/>
@@ -2628,6 +2607,8 @@
<xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.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.abertay.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
@@ -2644,9 +2625,10 @@
<xi:include href="swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.j2e.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<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/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"/>
@@ -2654,14 +2636,22 @@
<xi:include href="swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test-sp.ihs.com-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/test.ufit.onecampus.com.xml"/>
<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.ulster.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/test.vpp.midlands3cities.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/teton.accessiblelearning.com-sp.xml"/>
@@ -2752,7 +2742,6 @@
<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
@@ -2782,7 +2771,6 @@
<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml"/>
@@ -2951,7 +2939,6 @@
<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"/>
-<xi:include href="swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml"/>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
index 39fc9a31..37ae1476 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-04T05:43:26Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T08:58:24Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -97,6 +97,7 @@ M5r00gwrZAVynl2Imw==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
@@ -105,6 +106,59 @@ M5r00gwrZAVynl2Imw==
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
</md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uzh.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIGyTCCBbGgAwIBAgIUaP2onvcn8JF3V2Rgtd4Y3DPdls0wDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwMTE5MDk0MDE5WhcN
+MTgwMTE5MDk1MDAwWjCByTETMBEGCysGAQQBgjc8AgEDEwJDSDEYMBYGCysGAQQB
+gjc8AgECDAdadWVyaWNoMRowGAYDVQQPDBFHb3Zlcm5tZW50IEVudGl0eTETMBEG
+A1UEBRMKMTgzMi0wOS0yODELMAkGA1UEBhMCQ0gxEDAOBgNVBAgMB1p1ZXJpY2gx
+EDAOBgNVBAcMB1p1ZXJpY2gxHTAbBgNVBAoMFFVuaXZlcnNpdGFldCBadWVyaWNo
+MRcwFQYDVQQDDA5hYWktaWRwLnV6aC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL1HvFAYnMgYMNKotB3ZroxXp+UjHokAPoqO0RwUwSWU85xWUBh4
+1rvKkaLCTr2eOrPtWS90yabqJsitdmH92dzrgFbxdT7e/FdwyinwyfV2hcWHXHWO
+2OK9O/AurKe1S36ZS+kS78GQaIAKS5tp3dP1q8rYS7sTen/MquNRhy0E7uVcSABw
+BnADCpRJIN3edrv1Ka41I4W4FAsMSgr3dgmwQ4xrg2B/482VeW+tiq+NzmPRR/6u
+p2iQv2bjkyAmNPshTWeHYZpRAF3Zg/ZQjZhDVPRtjqiU+Wq5ntaRTCrkY4Y2COWQ
+rWN+Uh4OFSWrKpFc1aOPOI6vyWcS4Z4iGfUCAwEAAaOCAyYwggMiMHcGCCsGAQUF
+BwEBBGswaTA4BggrBgEFBQcwAoYsaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
+LmNvbS9xdmV2c3NsMS5jcnQwLQYIKwYBBQUHMAGGIWh0dHA6Ly9ldi5vY3NwLnF1
+b3ZhZGlzZ2xvYmFsLmNvbTAdBgNVHQ4EFgQUJ3XcV+xSN7MDp0eLpo8VIn7IZRsw
+DAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBRVWIbOunx2TpkTqQ/TbJ/C9dM84zBR
+BgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8v
+d3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MDsGA1UdHwQ0MDIwMKAu
+oCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2ZXZzc2wxLmNybDAO
+BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
+A1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFp
+AWcAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAVJZSsXGAAAE
+AwBHMEUCIQC0BJ59f/nVOrCAzSsNPbSnMODLYcao2T4a0js7HZhm9wIgUhJQDGXA
+EJ/MtqIe5j5jtuPYiotktVPMIlWUkOHT5KgAdQCkuQmQtBhYFIe7E6LMZ3AKPDWY
+BPkb37jjd80OyA3cEAAAAVJZSsiyAAAEAwBGMEQCICC/hLFK7J0asHg3xCB/UGWb
+eRVtl2PdOI1EyHK4j0XBAiA8DkiN1e3SK80mlJmeQmuN0CoN5tEMHBMZD2W3bFWN
+sgB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABUllKzGsAAAQD
+AEcwRQIgZyl/dNpQIyBBjT/Wq79EW45S5p+dy3PlwNsEo6vk4sICIQDmidXo2tDF
+jZbVi2g++aryPHRYCyw1/sxjUV3KZxAEoDANBgkqhkiG9w0BAQsFAAOCAQEACIqJ
+nxowoGjhWw5aO154e5uJm/8Bh/xn/8+Vnp5PdSQaYAgs92lPxUNTv1ZHK0fsFW2I
+rv3AJJKBeCIICB44zCSKlkMoLPtBpm05K++EptLjnvc4/lan8DjNy0phMNnhht3c
+9fi1KIEaOg394JTfIhkcukFKBReelrBUJgG+XkMsgfGdpOw7ULnSKUvcmgA2ypRL
+EncpfLGhDOKtalVy9oLF6cC9/dvnhAOPiAcBJMlkVYmXqmUmhProoyFzDq0pbLcg
+xGfdQXcGLCKIAlksfJ5v5r3Dnji7Wj5nAHRfigBxDv87F0ZKesV08pQlef1NcVM+
+M5r00gwrZAVynl2Imw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">uzh.ch</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index 90159289..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
- <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
- <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
- <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
- <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de/idp/profile/SAML2/SOAP/ECP"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="de">e15</md:OrganizationName>
- <md:OrganizationName xml:lang="en">e15</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="de">http://www.dfn.de</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.dfn.de/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Wolfgang</md:GivenName>
- <md:SurName>Pempe</md:SurName>
- <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>DFN-AAI</md:GivenName>
- <md:SurName>Hotline</md:SurName>
- <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..945c5ac2
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ehb-schweiz.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T08:50:31Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor errorURL="http://support.ehb-schweiz.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehb-schweiz.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">EHB / IFFP / IUFFP - Das eidgenössische Hochschulinstitut für Berufsbildung</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SFIVET - Swiss Federal Institute for Vocational Education and Training</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">EHB / IFFP / IUFFP - Institut fédéral des hautes études en formation professionnelle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">EHB / IFFP / IUFFP - Istituto Universitario Federale per la Formazione Professionale</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Das eidgenössische Hochschulinstitut für Berufsbildung</mdui:Description>
+ <mdui:Description xml:lang="en">Swiss Federal Institute for Vocational Education and Training</mdui:Description>
+ <mdui:Description xml:lang="fr">Institut fédéral des hautes études en formation professionnelle</mdui:Description>
+ <mdui:Description xml:lang="it">Istituto Universitario Federale per la Formazione Professionale</mdui:Description>
+ <mdui:Keywords xml:lang="en">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Keywords xml:lang="de">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Keywords xml:lang="fr">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Keywords xml:lang="it">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIZDQgoRoUtKwAAAs1JREFUOMulwUtrnFUcwOHfOXPe6zQzkxknrcGqC6mgFo0FjXcXpiDS4qUoIi4kLgUXbnRRXPsJCi67krZKtBGLihTEhYK0qEgNaUs7JE2TTiaZvDPzXs45fz9En0e9vXhdXns65vEjM1xaG/L+sTq//p7RH4RsXFeIH7BbGD76YIZGK8epBOMKnIrwePS+dsr8QoNDTypW/qk4d3qPC99MyAtF92DF4SMd8lGA0qBUwmQyRlRITQN6Bz3YKNnaquFFgdUUBTivCCPPOIO13jZxXLKTFVjnSRMBUXjn0bTRB2dDstEeayue+w5EvLtY5+ibHcY7Hl9YHj7cQTlwAugSkTpSE7wXrPPwx18T+fLUqtxYcXJ7WElVjuXva6X0rZWLv/XlxLGbsvzDHRl7L+eXMrl61cl6f0/OL41lczgS5UWksJ4IhVNgtOO7nwuSIKSeKGxQMPdYytLZnNGwZOHVlOVvR8SRZrtfoJUDoxVKV5iaRSrN9qBi/faES39mrN/MsbnlypUhJrSowNE4ILz1Ycqocmj0GK8EcOADCEoIBB2B1Q7nLL4wRIlFTIS1Ab0bjpOfbHLoiQiDTVHBBJTgAOVimqln3FfMPQrPPt/GoGi0QhbfS9C1Gvu7hs8+bqMDjRKfy9otoeYrfC1k9l7Nv71dpusp3qZ8f2aD+VfazO43nP1qi7n5Bs004ZefBrx8tI6xRFy4uEueaVpdx4nXQy5fnhAZjVOWzj0tptqar3+cEKspZmY8Z5bv8OD9wrnTGdqoCUkiRPWKIARdCc2wS5kF9K6B1TvEpqS3uok1I8ZFTLMZ8cwLTWzg0eITFApFzGivwlFR5JZ8FLGvIXQ7LUIVMhXOMN1UJFHF4FbJqc+HPPVcgHGqQlTAQ4+UDLYivjiZYaZjFt7IWf3P8OJL4I0hSHc5frxDEDmSNOadT+GB2TpKRIS7oLlL/wNnjGEYoDkDfAAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="29" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAdCAIAAACytXxIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH3gIZDCsw6oKoKwAAEjBJREFUWMOVmGmwXVd15/9r7b3PcO899777Rr33JPk9WUaSZQRtYuhgN7FNHCCBUEk5ocHQDAnGJjEkzmAa2tAph8SEVCATU8AY40AluKiQcojdHZopJqEtJgeMjCVkyXp68313PsMeVn94dHV1VZSKdp1Pe39Y9dv/tc5e/0VHX/GBej72SW17Z3T5svrMh29zA/eqt37q/ve/oVm3rJQDvfyNn3jPr7/w6OXtd/zZIx+65yuXXd7s7OxMJUsf+eAvHp3VyjXBAONfXYJA4BDABFAQEZAajFxv3DesmAkiSinrXAgSpQl8KMsyiiLvfQghiiJrLTMzBRFRoOBEGVNaT6yFlZIKF7P0D5/8wZc/eeuhffsH/dzLMIX+3tr6yY21It+eaDYQ9Nj5s2sbvbGr0PjGd1dufPl/+sjbXzRS7qY3fOjnXv1Hpz7/u1BhRL4OcwFgIYAZwQkpISIBajUd60kIiAQSlFIgMKOzM4ojPT1TDwHWhjjmwaBoZjVjqBAfKSXBe++9t40sIa2c9wiNiwNu1OtLC/PNetRME1AbATqqI9bQCjAAKeh2PU1gY4SG6D17GcYpqNfe9J/f/I53QwBLtUhdKICIgOBc0IpB5JxTOnrssRNWp81GrSiKODIiUpRVCGEwymupqtfrzJwkSa/XazQaPBqtr6/XTEsplcbqwNJMpCMQvJdEaShcHLBic89fPza7r3bu/Op/PHbw+qsWszRw5d//wD/vm53Q3nQHq2tFyU1tMdJ1OXe2t9Ib9kbD+/7uH970ppfBWAQzBGUXCMDEALRm8QCL1tp5aK2L3Kq60b6SUqy1sTbDsoigm3EDDsxc9gvlWHtFgVCKVblJkkDYvT6joVUQBEJ0ccDe+y988ThSdW5lJ9Nz111Vr5nI9kcP/e2JS/ZMlIORlU5n09SSKUbSnpi+9/7/cer01ub61toPz/3Wm2608EZM5gB9wRjei1JEDAG890rxoUMHe8VYsypGoTWRhRCKvFrOFsZFrgKiKKqqKsvS8bjq9Xq1Wu3K+aPd0UCrqBjnpUVvp5fGOmvUlNKQi1SYiD7+wV/aM9EQgBCCd51ud2Jq8u/vfV2rYQzXcycvet2fDjtr2HvJ5trmbW99+XvffL0l/4nPfPVVb3nPyYfvdFSSUurCxEqRCAggIqWUD3j88SdWdkomzM7OnltbFZH1re0syybak8U4H4/HeZ4vLy9vbm4WRSEi7XY7S8WYeDzK19e64u3ePXsmMgV/wZ/lBYGLPKfglAR4BrEidl6XCDY3ppkCCIr6uS2EHevc2Lg2AjmCfukN1971J1944sTpo5cfRgj/RuBdhREAAgBmHD16aM9O11tXq6fi/MREM68Wujs9ZdSeg3uHw6LT6TQaOLDnEmttVVVxHKtEBzBAVekUiVYQDoQgcnFFrOem59525z233Hbj+XMb02njBc8/YKKwurEZgBACM/vCVn0fRiaC9j3/6FfOfPfqTlm433n/59pJfOTIYTiUmuMLx/iRwgQRISIATzxxauyimanpr3/lGy/6qWs2u+7R4986dOhIvzM48eS55eXltU7elmRwfqUoimazOTvbWH/iXJqmrKOVlZU40bPTE8v75kIIzHRRwOqLDz1w39888lf/8+kv/dPj506f+JmXXOvj2pmzKz973bEkiTxgyJ85u33N1cuT7Ua1NX7waz945PvnH/rK11nrj73nzTPNstSRCbAU2JZQ2sIxgoMIcnYRCXkH0ZahKDjPsD6Qi+MsGoy6Xuy+S+bzsursbDabjayeBqeKfDAx0Wi1mt1OD8IED5Taa2MiF1D6youvN6LJZkrkAAbk3/+RuOAUVQADkQcDUKVDqaUOcaAYGPapkcESyAIMHQJcGImu1wIQ4DVU5VaF6r6qhUQnOZQqinhsfWo4pGVdEpAT0UTOwSqYKtf9fCAiWZaVVeGsByDe19JGYNUfdJqtepFXEBNFUWUL58okjsejXCf1Wi1xFvloZAiKWChclMLkilzFCt5CRYB2FpoFVIFjCLwFKfvLb//wW15z3bOvOFoAt73jgX/+9ndqWZtUft/dv3TpvsZ9j5x/z90fr+l2d71z62te9OZbr7v7Iw999BNfnV+Y6I/p6DLf/7u3Zy048QTlSGKiqhTvHShEke73+7VazajIOWetFxalScRrHdlKdjstpSgo8d6LUHBSlTYxCcAhXBwtAI04ci5oVROghCPDBFY2doxAUBHGhfmnb3Zv+nntgDv++2cefPj4lx96l93qlc48Y3HSB77zrR94400/+cuvf+6Tp90l7UYCHP/ayeuf88y/+ONfPLty9sab73nDb9z76Q+/WivtKcTCzqM7HIzGLo6NNpWiqDvM8/FOlrXK0vpQTE9Pb6yv19K6UnG334tM4nxVBR8bpRXarbqqR0AICCKi6CLfYRUYigFHQLLbGEFgBCgZTCBWpjk9k8SpDzh1bv321//cclvzxLzVAPLvfGNt7+Klt97yM7OJn/4POpbKQWptdfDSuRpweO/8e+9+za/89mdKsTpoT30lTVI4e3718TO9Zlbfv28+TSNbetb1Uz9c7feHl+6ZbU/y5pb3fmc8HsdxOh4VWZZ1+wOtJFbyrGOHmxmHwGAwAXAXqXBAIJDSAuEAAoFh4ZUoBGFECcO7HSOIBVNT8eeP/+/lLzS2VkbpdHjty368Nd/o+/L+v/zHqcbU+Z2nX/FTV+5fmrGlrSUxCJCYChPrqAyuTohUDM+Vt4cOHTpywDOJs+NGYkhHIHVgYt5EiY2qcT449uy9oyK3rmw0GuNRIcJJssdo7nQ6iMZFUMHZNI4BAZKL7LR0aQMxIgYRWxHnhJgiFg0CPCrnVZyAAgRRrfnoY6c+kX5pZSVfOlh/7Ut+fDZLevnoUw8/kk20zp1++vCB+cVLZ5JUnXr6zOrgyLgn//XOT77giqVGnCFYVBEMIjJPnjj5+NnOvsV5lmrpkr2M8P0nTrBJGlm7adDrDofDc0QyvzATQ505udZqzqyWPR/C1lYHoDRNsjQ5uLS3kf5bHd6/DsxQCTMABABGgokUxMMrSPDaFKSjSuI8DEW79Y694+YX33nzNbB6HAHAEyujxcmZf7jvplraUgJyCJD29J6/uO/r/3JysLm5fsWz93z4rleUgDARqZxcAj0/N0Om2cxSCmUUylazceninIdmE0Xs52aXNta30zTRJhhjFxem6vWsP9Z5UXI8E0VRPY2CG6uogFK4SPegvVdQRAALiOEUFEERVABIoaprBvtRTBl5DdeztF+gSSENqNiRWNal+Jr2gApgH2DWnu7/xq88/92/+hKdRz4t4SICAAcDhqOgmaKpprLW7ts7vXp+e220Xas1XUBVVZUmO+zBBBgKEm1v52U1mpltFx5bWztZliVJNB6Po0h3BhWxjPJxFEUiAmA0LgAopeJaWtf1WKvKFv3uztLSIsGLeCbSWjkfDAmIA+AUWIGB0nFEIDK2cqqzORxVY8cYbJfDnR5RLpxaCjpAisHKuVUOUqkK0BEbAHlv4HrzQMypYxAIKoBCAgUiL4InT53dHOdxpJPJds7RuBh/98yTzKx0RBXG+eDA8iWKVK837HY7/cHO9MzeMteDXlhfXdXaJEmSJDEzx4nZWhvHqRCRiPT7w7ws6vV6o4GsPmLm0WjgbLm4dyHWCsQAaYhVMBAAAUQKHsELM4EYAcQk5Uuvv2puOiPCc48uLh+cA0hQArEwt5tTL772eZFEkaAiB2IJo2t+7JJL989HHiANLuCMMgwCfGl0TIzLn3mAXJEkCaGcnUvHY1ma2V+rZ8ycB8qLIoqV0abRCvv21dP0Mh+qyRk9M3eZ91IUJTNHkbHWWlfOTLV3FVZKKTXlgjcmrqrKlgxgbnY6BCeBqkoAhOBIpBAfEwdPPLbIjIVXY8W1AMBCDLjsU9wIjkRDISD4IBHncA0owNnSIBbxEgk77Ri66zApAkN5JQzEhgAE8Z5V5Wxdm1CGylrjnPPOKqWMMc45EHvvKcTErrIjIERRAk9EVBQ5aUVETIqZQwghBKUZgPIGTCG4EILWOoSglLLWsmHnnFJKM5dlSUTM7Jyj3V3AfvKBb584c/5db/3p7bXhO/78wT++48asmQYPpvI3f++TN7/yumccvFQIt9/16Ye/dDJuJFOJ/pM/f9WR6fih7/d/587POVY72+ff+Asv/9Vbrrr3s1//0Ef/Lq1PdkO4drn97t9//YTpkJvUFEhBkFdlPbc+eJskSTEeKqXqWdrvFyCVJYY4aB0AASg4YqV2h2FE9P+7wRBCYNYhgP/vtnNu14Tu2mTnHTPvDiGcC1qzhlICBLjHfnD++ONPkTZVxZ//8uN3/XoehVQbjCv98D+efemLywOE//buz/3lXz/22Y+/rTveDBgcnJ4LwM03333j85/z6tde+cOnT1+xvD8CHvzsIwf2zN31ztdtdJ76tdvvv/23P/qx972SNUgYFsGk3/2XH5zpdBfmZiOjlFJVVbVarf5gNMwL6XWuvua50LzrOIMHK0CYdgeCDswAQQKImYm9BP4RbtgdrQBBQhUgio1W/++IWABoEkCgmBsTE1GjQRCIn1qYZybWYASlFTemdVwH8K0nV171lhue92OKccCB4fHN751rTs+9650vm0iS51y+AFEWaE3MHTs6+6ylCIuX/cEf3n7nHfc4G0UGgAcpAR8+ctm+ca+WpExQikIIOzu9hf0zrFV/1OLYewiYHUjFFGABL9ABgY12IBFhDSBUrjI6BVA5a7QKEhTt8oni2Hu/m8nee6WUYgQJmilAGBDioCJS8AzvaKQDDABHBKvSXJNlj8kFc+7bpx/91oEzZ7faDfPi65+5kKXsys/+r+PN9kJ3bfWFVx7Zf2DS+YEzMwU4NirSayaI8pa0QfAg68DCerVvq61BLYmM0tZa691TnZV6PZudbJ98qjMejkSUrXwUa23k8KF9Kyu98+fP12qNLMu63W5VVWkaR1FUi0dE1O/3Dx8+YJidh1JQpCVAsQIQApRSAAhgYu3BzCBJgBD7QKKLRMXeFFGFAC9E2ljy7GNRth1P3PfVRzverWyNjy0kN7zwWa3J1s6IPnDf15JGY/2pjdYdM/uXG2lc29rsJ6DtvPzN3//7Y5dPJFENcKK0wMcwa531vBhVQ5NoU7h+v1dqrjez1tbWJuxg//6ls6Vd39hqtVqVK4MEH9BsNHbSNEDyyntlEHHpUPlqnNs40mXllAIAteuOCUQ/qvLdhA8hEBERaYIFFMi7YIVYPFxhOVDdNzw5RaRKl7jJoc0ZtL4+eNutL73jlhfspieCP/30xsI0HvrYbc0sDRhFiAViplp/9qkvfuf4xup45/Di1Pv+6BYQIBoEFvaCLMuMTvccbW5u7WS1xdplyjo/Grsjlx0e9gZwxdLi1IF9c8xMJMV4ZIfDREVHnjE1HOdGtQSttOaZMeg4Z7R412zs2en2FImIN8ZorZmSoiicc1mW5Xleq9Wstc45zYDAA6Sj2HpPCvWE3Kizs13UpmKv1Xbf5utnZ9I2RI9IGRop5CAD1gHiFYlilUQKVqMOH4iQr/V/7TXXv++3fnZtq9ucmUjhIFoYEkAQxf5739k6vfHk7Mzi9vrOC3/yqoEbP3Wqs7MzvvonDj9+sivEqxvrURRprb33tTjxtqqcn1+c2NjaykcbGxtrN9zw3EatfvybJ1Cr93o7ray+Z3Zuc3NzPB632hOKTVXY7e3tOI7jOA4hzM3NbW5uMrNGMERw1hdVGOdDwO1fbDUz/8o7Pv3VB26JVPiFWz6oGubQM2dK5P0q74whlCKI90GM5K4oBjm6jqZiYZCCiPSLYm/aEinnZiZIAryGDh6sGICDmGPPax2zL9jeHNaPLMy1udMJc20cObSAcvSsKxa990v7Up1orTUcvPVFUdRqDevdwkxLa93vTk/EPFFX1159iHS8sbFRS+JWq9WdVGVha1mzrCrFAZgiohCC9945O9Nsaa1/5DW0UY1GY2lpCd4HFe699+7/cvN7D1z3dka2f7Lx4MfeGQV4iq+cSqanp4NAESlNFWyapnv37q3VYhBEEIJXSs3MzMzOzhKzD1AXmLGVZbmw0C6Kcqe7E8eNyclJEe+9K4tRmqb1eh0a1loExHGcpqm1vlnPqsoy8+TkpCLp94egYAs7Pz9ny2owGNTr9WZmnMBEEcQC2C1gEdmtYa31/wEu09ISiEvnQwAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="de">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>ehb-schweiz.ch</mdui:DomainHint>
+ <mdui:DomainHint>iffp-suisse.ch</mdui:DomainHint>
+ <mdui:DomainHint>iuffp-svizzera.ch</mdui:DomainHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQDCCAiigAwIBAgIJAJ3M6RXWA//7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5jaDAeFw0xNDAyMTkwODU4NDNaFw0x
+NzAyMTgwODU4NDNaMCMxITAfBgNVBAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAN2avTSONQyVmUrout
+iUiLIOr76jMCW6TZ48uvUHt0D+GxPmbkE5lMxVpmTvBxsMd687o6IqFsqMw3pSzt
+hyJ/Zl+T7HCANhPKKUQTNd1X/OX6L1QAi6r88dgcZtlM7RYRwoj8fJ+EFk6WhJuJ
+74UcJHKYx0U9dYY2B25ld+GM1Ah0NikNf2pE+Hw2J0l+O37QpG7aI6GzqYYCkD3V
+qI5BvMkK5EzFZI1FBNYcahBsHyIrP7c+GLTJsBEbBvzbxN/GX8zT7Em1KCpNllu4
+DEqk3f8ZjWJFFJlcgHVKF+DUxswr7PoU/QhH1yMcy4+CHP138kCoOJdhfAN7dEtf
+7M8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYYWFpLWxvZ2luLmVoYi1zY2h3ZWl6LmNo
+hi9odHRwczovL2FhaS1sb2dpbi5laGItc2Nod2Vpei5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUhierWG+h39Wt/g62bByZw6xwTU4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIJofpvKjzSqGnON+rSXn94cs4ubAkuOQEn/XjnoJByMAFXWGcoEK9O8bFfE
+RDAeY/JqRUf72oToSEnOW25EtHZI+76H6Vss0PQ2OG4xfndgjIJeWkkR1nnSVrnh
+YRbHTwUna9v06DXYR4C6cwOEc/AyWLL7cdHb0cnydLAaNxgF7JYrPvMtGxCgoQtm
+rzLxebDkJ/9NyB0ChJh1MiYoHgo4DqnMGNAFg8wKEoRjbTAvR+/urdtomR+DEhXF
+6q5pVoS+6mcH5JbAAaMlP3IMdqMtlXQLZfrrIki4oK1oKmG47Im25K9sucNtCmmk
+SMtMXUOPoo2ywvrbXUtGDDHFJYE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.ehb-schweiz.ch/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ehb-schweiz.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ehb-schweiz.ch/idp/profile/SAML2/POST/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehb-schweiz.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQDCCAiigAwIBAgIJAJ3M6RXWA//7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5jaDAeFw0xNDAyMTkwODU4NDNaFw0x
+NzAyMTgwODU4NDNaMCMxITAfBgNVBAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAN2avTSONQyVmUrout
+iUiLIOr76jMCW6TZ48uvUHt0D+GxPmbkE5lMxVpmTvBxsMd687o6IqFsqMw3pSzt
+hyJ/Zl+T7HCANhPKKUQTNd1X/OX6L1QAi6r88dgcZtlM7RYRwoj8fJ+EFk6WhJuJ
+74UcJHKYx0U9dYY2B25ld+GM1Ah0NikNf2pE+Hw2J0l+O37QpG7aI6GzqYYCkD3V
+qI5BvMkK5EzFZI1FBNYcahBsHyIrP7c+GLTJsBEbBvzbxN/GX8zT7Em1KCpNllu4
+DEqk3f8ZjWJFFJlcgHVKF+DUxswr7PoU/QhH1yMcy4+CHP138kCoOJdhfAN7dEtf
+7M8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYYWFpLWxvZ2luLmVoYi1zY2h3ZWl6LmNo
+hi9odHRwczovL2FhaS1sb2dpbi5laGItc2Nod2Vpei5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUhierWG+h39Wt/g62bByZw6xwTU4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIJofpvKjzSqGnON+rSXn94cs4ubAkuOQEn/XjnoJByMAFXWGcoEK9O8bFfE
+RDAeY/JqRUf72oToSEnOW25EtHZI+76H6Vss0PQ2OG4xfndgjIJeWkkR1nnSVrnh
+YRbHTwUna9v06DXYR4C6cwOEc/AyWLL7cdHb0cnydLAaNxgF7JYrPvMtGxCgoQtm
+rzLxebDkJ/9NyB0ChJh1MiYoHgo4DqnMGNAFg8wKEoRjbTAvR+/urdtomR+DEhXF
+6q5pVoS+6mcH5JbAAaMlP3IMdqMtlXQLZfrrIki4oK1oKmG47Im25K9sucNtCmmk
+SMtMXUOPoo2ywvrbXUtGDDHFJYE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ehb-schweiz.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ehb-schweiz.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">ehb-schweiz.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">EHB / IFFP / IUFFP - Das eidgenössische Hochschulinstitut für Berufsbildung</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">SFIVET - Swiss Federal Institute for Vocational Education and Training</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">EHB / IFFP / IUFFP - Institut fédéral des hautes études en formation professionnelle</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">EHB / IFFP / IUFFP - Istituto Universitario Federale per la Formazione Professionale</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="it">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>AAI</md:GivenName>
+ <md:SurName>EHB</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@ehb-schweiz.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 31 910 38 38</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SWITCHaai</md:GivenName>
+ <md:SurName>Team</md:SurName>
+ <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml b/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml
new file mode 100644
index 00000000..47958e4b
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon-qm.its.unibas.ch/idp/shibboleth.new">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T11:48:21Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">New Uni Basel Test IdP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Uni Basel Test IdP</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.unibas.ch/de/</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVAKMVlGIsXbXX6z/I2qFfxt6K2G3kMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmFhaS1sb2dvbi1xbS5pdHMudW5pYmFzLmNoMB4XDTE2
+MDEwODA5MDkwNloXDTE5MDEwODA5MDkwNlowJTEjMCEGA1UEAwwaYWFpLWxvZ29u
+LXFtLml0cy51bmliYXMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCjkH9DBmxGnJascUF6vkqYVzcn0v9ghkMVG+kRp5IQ9le04xVX5DoF1hFrSltj
+FVillz+7t4Uu3X6ciTFaqPBsbLVrqUuMh8a+Xgc3nYESlnp+vvO7m2sQI5tye29H
+fzx+kGZ0xQg65wc/onAAJl08DSD4kbHq3DQ4Vh1pCujRTXZio5JyDy8bMAzY1rr6
+KSFUSgnIqGBnSNyCsUNCYg2z5USxYp4dApWyGM3o57XGPTgzKLJWzjgp2V0hEInh
+hq01hazS1MXPYKnjB4BE+RvrPwJomEsXc0IAHhrzrHUc49HCNgGQIkOin2NTBS3j
+Dvql2MPQGM+yZYNzo6pG0nX5AgMBAAGjezB5MB0GA1UdDgQWBBTJItTcSDnPKqFE
+qBsxdXzQzzro1TBYBgNVHREEUTBPghphYWktbG9nb24tcW0uaXRzLnVuaWJhcy5j
+aIYxaHR0cHM6Ly9hYWktbG9nb24tcW0uaXRzLnVuaWJhcy5jaC9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAArwIaf+veOMBYFQV1X8ulhK4lnZqEd4u
+CW68H3EQIJf8SCUzSQd5YSGxAUO2m7CfLYYfD72SMoZwzlJxwhUDYh4DA/wEh+y5
+xlY7dGicQItvQo8j9opYfYhfCfR1B9PcJmLk73/2YrhSg/EcEpnO7mshK6DF7ra5
+MOGRssldMlB1Mgo3zAzv6tU1PUttdELwXIMadrRKpNK8jni5kCYMhuz2XXYgxbU1
+DPsuN02KeGlGK38oh3Bddp8jYzwa7ntEk6UAzz76DuqitupvvZ4h+oC3bM9YWa5Y
+GRk9+65QCpWxAI40kQ5E0mDxrnfiHC2I8FJQXY4ZkqvSY7674l1mXg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/POST/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVAKMVlGIsXbXX6z/I2qFfxt6K2G3kMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmFhaS1sb2dvbi1xbS5pdHMudW5pYmFzLmNoMB4XDTE2
+MDEwODA5MDkwNloXDTE5MDEwODA5MDkwNlowJTEjMCEGA1UEAwwaYWFpLWxvZ29u
+LXFtLml0cy51bmliYXMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCjkH9DBmxGnJascUF6vkqYVzcn0v9ghkMVG+kRp5IQ9le04xVX5DoF1hFrSltj
+FVillz+7t4Uu3X6ciTFaqPBsbLVrqUuMh8a+Xgc3nYESlnp+vvO7m2sQI5tye29H
+fzx+kGZ0xQg65wc/onAAJl08DSD4kbHq3DQ4Vh1pCujRTXZio5JyDy8bMAzY1rr6
+KSFUSgnIqGBnSNyCsUNCYg2z5USxYp4dApWyGM3o57XGPTgzKLJWzjgp2V0hEInh
+hq01hazS1MXPYKnjB4BE+RvrPwJomEsXc0IAHhrzrHUc49HCNgGQIkOin2NTBS3j
+Dvql2MPQGM+yZYNzo6pG0nX5AgMBAAGjezB5MB0GA1UdDgQWBBTJItTcSDnPKqFE
+qBsxdXzQzzro1TBYBgNVHREEUTBPghphYWktbG9nb24tcW0uaXRzLnVuaWJhcy5j
+aIYxaHR0cHM6Ly9hYWktbG9nb24tcW0uaXRzLnVuaWJhcy5jaC9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAArwIaf+veOMBYFQV1X8ulhK4lnZqEd4u
+CW68H3EQIJf8SCUzSQd5YSGxAUO2m7CfLYYfD72SMoZwzlJxwhUDYh4DA/wEh+y5
+xlY7dGicQItvQo8j9opYfYhfCfR1B9PcJmLk73/2YrhSg/EcEpnO7mshK6DF7ra5
+MOGRssldMlB1Mgo3zAzv6tU1PUttdELwXIMadrRKpNK8jni5kCYMhuz2XXYgxbU1
+DPsuN02KeGlGK38oh3Bddp8jYzwa7ntEk6UAzz76DuqitupvvZ4h+oC3bM9YWa5Y
+GRk9+65QCpWxAI40kQ5E0mDxrnfiHC2I8FJQXY4ZkqvSY7674l1mXg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">New Uni Basel Test IdP</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Hanspeter</md:GivenName>
+ <md:SurName>Spalinger</md:SurName>
+ <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Hanspeter</md:GivenName>
+ <md:SurName>Spalinger</md:SurName>
+ <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
index f80445c9..d828c2d4 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-30T14:44:37Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T14:13:02Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml
index ca1b4841..e44133c1 100644
--- a/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.idiap.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-31T09:16:03Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-05T14:46:58Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..33ca2965
--- /dev/null
+++ b/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aci-bookings.sisoshibboleth.co.uk/entity">
+ <!--
+ This is a "SiSo London South Bank Online Resource Booking" Shibboleth SP for TechEthika Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-06T14:39:40Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">SiSo London South Bank Online Resource Booking</mdui:DisplayName>
+ <mdui:Description xml:lang="en">SiSo London South Bank Resource Booking</mdui:Description>
+ <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+ BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+ DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+ MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+ bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+ dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+ +VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+ 5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+ A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+ grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+ bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+ GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+ GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+ dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
+ firJubLNu96jbGctasqcpQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SiSo South Bank Online Resource Booking</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Info</GivenName>
+ <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Steven</GivenName>
+ <SurName>Oates</SurName>
+ <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml b/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
index c445084a..f9fccbb2 100644
--- a/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
@@ -43,6 +43,11 @@ xFxzcdITxtRaIIG4
</md:KeyDescriptor>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.csustan.edu/skillsoftimport/assertionservice.aspx" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.csustan.edu/test/skillsoftimport/assertionservice.aspx" index="2"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">CSUStan Apps</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">CSU Stanislaus App SP</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">California State University, Stanislaus</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
index 36947b9a..be222eeb 100644
--- a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
@@ -25,23 +25,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
-WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
-ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
-3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
-m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
-snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
-2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
-AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
-Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
-etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
-OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
-7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
-wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
-U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
-1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
+MIID9DCCAtwCCQDDKKmEOwqI4DANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+SVQxEDAOBgNVBAcTB0JvbG9nbmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyND
+TlIgLSBBcmVhIGRlbGxhIFJpY2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmli
+bGlvdGVjYTEeMBwGA1UEAxMVYmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZI
+hvcNAQkBFhhhLnR1Z25vbGlAYXJlYS5iby5jbnIuaXQwHhcNMTYwMzMwMDgyMDI3
+WhcNNDYwMzIzMDgyMDI3WjCBuzELMAkGA1UEBhMCSVQxEDAOBgNVBAcTB0JvbG9n
+bmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyNDTlIgLSBBcmVhIGRlbGxhIFJp
+Y2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmlibGlvdGVjYTEeMBwGA1UEAxMV
+YmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZIhvcNAQkBFhhhLnR1Z25vbGlA
+YXJlYS5iby5jbnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5
+Sv5rRfMx/i+VbaR6FmuPGHqcJJ9V+IfbYNVu+/p6qOg+pFwqg5ZuaF674aQ1dczN
+hVgJOEG7p3TjUAGAqX46iURqX0bXVkOzwLKfXLhfqAKPr9eMSoWz6RAk0/IAQaZT
+58XEHpwTBxLqgDrH5M6gMNfXg7wY+iBsvhNakVp8Sw9vW7KiVT/fQSNu3EDSP0pB
+iqJOtUErupGBk8SdBvc1mI9ue5QkakcjsqnKdLI6cQ9jHIn4bUSBMmL3Q4b9q/0A
+/PlY4ZX29HzhGCJ8KrhpRzMjSf5CY317RSQNE9bI8KBkdng1ll8H47L7QM7Hig2P
+C5htmoaJA4Qx8omwc8uNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACsPRjQctB8Z
+4IM9iJnImqaOYamRDiRJuSTlEZ/dB2mmRf4UsQIBk6nyQY1/cGxamq6SWKUli1fR
+9NthLGYth+CKGV7CbrLYSRWleKTpJ2SKMG9AvtrgavY6ca6AxL6p3yckM71Eonx1
+BB0TdrYQKHiUhbbB9kXMXJNWC/fcd7comscB918uh0GynoYxXSowdnGl+OSZerti
+D69Oez5fVQ4PDv1iV3Uqd8zcUqxfsa9zX2UL4pnmHMANxFeWI4+om7rTFC0btcKQ
+IwD0Nf/pB+PAFyLHQPBrEjofpdriNJFDiDjW/+4yPxwnlQcMwXpBy4fK21gZCBqu
+LdV4oWGgz10=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -66,23 +71,28 @@ U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
-WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
-ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
-3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
-m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
-snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
-2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
-AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
-Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
-etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
-OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
-7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
-wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
-U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
-1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
+MIID9DCCAtwCCQDDKKmEOwqI4DANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+SVQxEDAOBgNVBAcTB0JvbG9nbmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyND
+TlIgLSBBcmVhIGRlbGxhIFJpY2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmli
+bGlvdGVjYTEeMBwGA1UEAxMVYmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZI
+hvcNAQkBFhhhLnR1Z25vbGlAYXJlYS5iby5jbnIuaXQwHhcNMTYwMzMwMDgyMDI3
+WhcNNDYwMzIzMDgyMDI3WjCBuzELMAkGA1UEBhMCSVQxEDAOBgNVBAcTB0JvbG9n
+bmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyNDTlIgLSBBcmVhIGRlbGxhIFJp
+Y2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmlibGlvdGVjYTEeMBwGA1UEAxMV
+YmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZIhvcNAQkBFhhhLnR1Z25vbGlA
+YXJlYS5iby5jbnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5
+Sv5rRfMx/i+VbaR6FmuPGHqcJJ9V+IfbYNVu+/p6qOg+pFwqg5ZuaF674aQ1dczN
+hVgJOEG7p3TjUAGAqX46iURqX0bXVkOzwLKfXLhfqAKPr9eMSoWz6RAk0/IAQaZT
+58XEHpwTBxLqgDrH5M6gMNfXg7wY+iBsvhNakVp8Sw9vW7KiVT/fQSNu3EDSP0pB
+iqJOtUErupGBk8SdBvc1mI9ue5QkakcjsqnKdLI6cQ9jHIn4bUSBMmL3Q4b9q/0A
+/PlY4ZX29HzhGCJ8KrhpRzMjSf5CY317RSQNE9bI8KBkdng1ll8H47L7QM7Hig2P
+C5htmoaJA4Qx8omwc8uNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACsPRjQctB8Z
+4IM9iJnImqaOYamRDiRJuSTlEZ/dB2mmRf4UsQIBk6nyQY1/cGxamq6SWKUli1fR
+9NthLGYth+CKGV7CbrLYSRWleKTpJ2SKMG9AvtrgavY6ca6AxL6p3yckM71Eonx1
+BB0TdrYQKHiUhbbB9kXMXJNWC/fcd7comscB918uh0GynoYxXSowdnGl+OSZerti
+D69Oez5fVQ4PDv1iV3Uqd8zcUqxfsa9zX2UL4pnmHMANxFeWI4+om7rTFC0btcKQ
+IwD0Nf/pB+PAFyLHQPBrEjofpdriNJFDiDjW/+4yPxwnlQcMwXpBy4fK21gZCBqu
+LdV4oWGgz10=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
index 2ae28507..590e79c8 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ iaCTH9LM7/F3Hd+I
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
index 02d5ba03..6a6a119d 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ Yddwdo55oZyYRtYPfvbI7ThZ1slkiND3U2W3u3G/XgbN0Jd8Mp6UBnLttIqus3iK
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
index 7b0467ed..87ef0225 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ Y0vFLNNUbts2J7AXDQK28bn0u2mnK6aC2eFqEgcTU6xg+qQbj81PxKigfSJRsh+R
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
index dcb69937..43cd5b6e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ Zd682vK8XDpmc0mzv5AP2Bncmy2W1upHBNE=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index 25e30b97..a76ed2a5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ bNSPxoYF
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
index 0ad530f8..59552797 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
index ffe12fd6..ca5e4b5e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ oDZnFjBuo5Hw31Z+O4L9t4eVzBM=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index aa0b3571..297eb0e2 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
index f81b7e00..b7525e7a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ dPcr9FHbXBQ=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
index 1edd2b24..958e4a20 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ fwnoK0wK5Qy+Hac98sg1DygI
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
index 68873fe7..a4673b7c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ Kz+Iv2SAMUA=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
index e3b1d592..d64bbb42 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
@@ -52,6 +52,6 @@ Wma0d+CKLHPagLmm29t8EF37hZE=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
index fe1601b3..a063c8da 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
@@ -52,6 +52,6 @@ rBue0WdqjxUhj4Yyw2JK3w2jM3vzSNu7HWJ8AIBKco5rG/vo
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
index e86709c6..4795f2b4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -54,6 +54,6 @@ I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
index 6ac0f8d7..70502449 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ HM6p9FnQoiWszraaknJsQ8E+fjjqZ1dY
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
index 3693752d..eab832bf 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
@@ -53,6 +53,6 @@ t3FWDnyLxXBh+nay2r+6OQNF/HI0V54HHHXpFhvg3pAfZSmrhjI=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
index f8a9da46..77107bea 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ d3A0FABe5reA+KtzVrTieVTjWHGQtF2W1mNkWx2Gi1lGu25F
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
index f82a35d2..85dc2d27 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ sIsugcTH6K28MleLFhFT1ZJ8bJ4C5QRPixp3NRKK/pTRUi24c/NtsxiW2I8=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
index e082af18..40053178 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ h8V01qfDTMmw4ASc
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
index c9134eb5..23819594 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
@@ -54,6 +54,6 @@ dQDb0gK1ALtFHsR6o+DkLOvLyImsQq8zCLwhzROY4ig=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
index 135eeff8..0661bcd4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ uVff9vzTPfw=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
index 1048552d..a83d98d3 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ mZA0QGYfa1EL1Q==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
index ddaf2118..8be4a74b 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ H8vDIZSNJeoj/SitEpgjanw5oNXtqn16gZcB2v/fPs2qDbs636amU6ELoV0gpQjv
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
index 8d93b2e4..8d1a0a0f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ GG6TK2xCAz6z3j5/OuMvrJGZ8BTGt2QC
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
index d7f34452..f6e24f15 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ HkNhvouMOcU=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
index 92545964..48e8901c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
@@ -54,6 +54,6 @@ jZehS9P/tKKffrsqCxpzGtwrXTEfxfMsmYVKeQ==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
index 69cda8cb..428f515a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ uZJ5q8OhIN1jFsxF2xY8T+xaHvObuZJ9246bmlRQrtx7fAkCtyfCN9zPu0STf68+
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
index 30e1a288..89eaa2d5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
@@ -52,6 +52,6 @@ TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
index 00cbcf9f..70351d51 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ b45SXMc+awoz7kMadUeuovVtd6ETEsnnNquJ7navnN/e7w==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
index 0e569235..557dee11 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ I7eDefwR237lfmpOKMk=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
index c3d12852..c1ddb0cd 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
index e3ca340d..a833dee0 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
@@ -54,6 +54,6 @@ YNCobCjLM8GtgKPZGSBhP+avu6w=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
index 209b9e9d..1797c6c5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
index f6d5f4c2..fa131cfe 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ DdbjKB6UO7mTuqPKUxkGG2oviO3YApEyi1jggBDOeblg450UyjsTJcivVg2prmgB
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
index 3f48ae33..a29faf11 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
@@ -52,6 +52,6 @@ waSgkcygO9PTBU5lKpmYMlUx
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index dd0c04c3..6f8d7cc9 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ DoLyd1u8
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index 29a30936..887eac87 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
index 97bc1987..9d34819c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ fxDMnDXCEVeGDaSfpKS59rujNM6pWzUKYjZQiokpUDvikcroFe8BbdhqDwndle76
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index 9744cecf..9377e793 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
index 4ef91847..14ee49fc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ p+TiM/eBbXCraZ32+zNbKfPC
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
deleted file mode 100644
index 6b21f5b1..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/metadata.php">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-27T13:39:42Z" registrationAuthority="https://www.wayf.dk">
- <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="da">Dansk Sprognævn</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Danish Language Council</mdui:DisplayName>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>dsn.dk</mdui:DomainHint>
- </mdui:DiscoHints>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLmt1bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLmt1bS5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQCrWx3Zrlrbj1kGSlbADTE1MQ40Q0dN+A9HdEUrt68BvTgvr0Qz5pinXL3gFFMv
-YgSprMT/PAGuXJeRiaxWFi6vsUbM8ie4KnP1tUsDvlKTGt8yZRzbiHBPJ+cl7iM/
-iNeJWFcLFamx4uXc0Lrn0mYdQCiknB6OOF11zl837WxOZILuFa7eZanR286emuIo
-JY3Dihrlt0esADrBci2CwRwSljlSJ/Y4FW+7bD8KY2ObxbQSxhzoeiDD8lSbOrVO
-cKGhtXil7cspCMSTbNpbSpIcgel6CauLSRw5R2qJBAd7KHm6eQGBOXzVDIOQR3tc
-j2IrcoJ3QM317FlrycurdCEq
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="da">Dansk Sprognævn</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Danish Language Council</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">Dansk Sprognævn</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Danish Language Council</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="da">http://www.dsn.dk</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.dsn.dk</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
index 9154f45b..716331a6 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
@@ -52,6 +52,6 @@ v93+XEHzeHHw5pwvSa0YWMs2hXkVYFnHrTicG9bEV6qKoNYG
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
index ca5e4297..a2de999c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
@@ -52,6 +52,6 @@ G9baPBH3swAjkG8Aa/+wabJPIBCF5mR8nO9gQQk4wgs17mS6
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
index f1a09006..6519e816 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ FCi7nKlzaklaH/SOTHq/dQBIWfezdWZwzJez/ZlcHeFV8g==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
index 5f2fb9bf..798d8919 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
@@ -52,6 +52,6 @@ LvJ2p7KuCR1XMFXRBimf3zUsLH5CKx4AOaUJ+A==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
index 6c23adea..4f010773 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ r/xz9uFt2RzjLOXXnNTxdxNYM+57s7iSEGi7ysNfGUZJ8IY8sv2qGwGpYRcE+M6f
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
index 47da105b..a69bf1ec 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
@@ -56,6 +56,6 @@ LV8Nl3w74u1j520EDfu3HQ==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
index 4de1a3fe..0814c6cc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
@@ -56,6 +56,6 @@ Z8bY2QouT70h3w+L
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
index 9a415086..883bb3da 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
@@ -54,6 +54,6 @@ YWDGqSgnwi1H313Tol8U/A==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
index 1fe1ea03..e8812f84 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
@@ -56,6 +56,6 @@ gldjnwhQkoXCB2mN
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
index 0031edae..b92ada72 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
@@ -56,6 +56,6 @@ q1H8RSir+nACRQ/fLPgySCU97iU=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
index 7c5c7d4f..23d5a547 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
@@ -56,6 +56,6 @@ Z0FIk7cDlCfAO6WS9Da4VQ==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
index 9ee33d27..85d96402 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ XUPP28ILRNV6EqIHjKw4XqDP
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
index 022d8ed6..8daa2096 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ p2YMU09Pb33T82fJfzyq0fwa2AhboACWsblekPEHoMxrzNQUuKzcoGbK+WI=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
index a057c503..3ba4ca3f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
@@ -53,6 +53,6 @@ tPD3c+RitftZZdVVSFgdbMdcTZ3log==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
index f216a466..0ea8336f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
@@ -55,6 +55,6 @@ Wl7WIRfFhXMrMTMiDDMGbZpFe+s=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
index 8ed99928..655583f4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
@@ -53,6 +53,6 @@ adTtql0la2qKXumMxXSsTKT5/gU1yg==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
index 12ef2347..cbe6254e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
@@ -53,6 +53,6 @@ oTQy5sOe4dSs2/n4/PlkBFwsHcE=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
index 9bc5f3f8..48b4690a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
@@ -55,6 +55,6 @@ AKktIsPch1tYllp+fb1/Be5pd2o+Aw==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
index feb36a41..d322b706 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ lsZ14BWXRzkq1VI5Y+Zp/Zq3t8JSNW+T0O/TJXvjt5mdYhu9YKFTMVMujjE4v7qv
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
index a25c46b7..9487dc5c 100644
--- a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
@@ -36,39 +36,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
- MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
- HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
- EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
- Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
- eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
- 1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
- aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
- MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
- BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
- ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
- UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
- Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
- hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
- MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
- ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
- wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
- tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
- VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
- nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
- +4L3YUYYg5I=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -108,39 +75,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
- MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
- HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
- EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
- Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
- eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
- 1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
- aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
- MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
- BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
- ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
- UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
- Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
- hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
- MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
- ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
- wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
- tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
- VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
- nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
- +4L3YUYYg5I=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..fe7e109b
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufpel.edu.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UFPel - Universidade Federal de Pelotas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFPel - Universidade Federal de Pelotas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufpel.edu.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufpel.edu.br</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxMDAuBgNVBAoTJ1VGUGVsIC0g
+VW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVsb3RhczESMBAGA1UECxMJQ1RJLVJl
+ZGVzMSEwHwYJKoZIhvcNAQkBFhJyZWRlc0B1ZnBlbC5lZHUuYnIxEDAOBgNVBAcT
+B1BlbG90YXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
+UjEaMBgGA1UEAxMRY2FmZS51ZnBlbC5lZHUuYnIwHhcNMTYwMjAzMTI0MjU4WhcN
+MTkwMjAyMTI0MjU4WjCBwDEwMC4GA1UEChMnVUZQZWwgLSBVbml2ZXJzaWRhZGUg
+RmVkZXJhbCBkZSBQZWxvdGFzMRIwEAYDVQQLEwlDVEktUmVkZXMxITAfBgkqhkiG
+9w0BCQEWEnJlZGVzQHVmcGVsLmVkdS5icjEQMA4GA1UEBxMHUGVsb3RhczEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFj
+YWZlLnVmcGVsLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKe6wNljSw+nFuwJHZWc9LEPraUrwTUmxVrZ7GQCrWQmw6Sci5cJU+qHGfN8r/Ca
+X/VqkJPk9IheSpzsvU+Jj5X0TUmG5HBhVHc5zsDaGdLxTmPPL8tMS8ZNJpzU7/vY
+JEH3rOYmW6ZQI44tiO+1/xS2NVBbDAd0QqNcz11tjSSe59Zg0mVi4xSePCcYT295
+B0ZcEkeFmPX38SZ8gw3AOGlCBmFFhkjUZ1WO1/K3qJpL716HJU2GlaZ4gB4FS2dz
+VbeebsT/hon8Pc+OkqZnJUiL3BrKkoPF0OhgP99ZAzb+Zp60lMzPbCd4oz3aJSh7
+23cIyqy1RDSvJX6Mn9XmKrsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi3uyG/Sn
+FTbkDgpF1bK82QPwDs06lwy8Nf1Ob0lYCn9m76OIk4deCeBTTak98bLyN0VVmMUU
+CFsMMonKBkyDOOA3HZYZ5cxBw+3PZLa8Vb8PJ4siub9cgO+VMhN5sLrLU9LLf7H+
+Y0s+csJy3VSpe77RY+orKjNZHN9znrJN2tHYUtvsuhzQhDddEJ14y4XbHbao1KD6
+EXoDP3ldJUoUo3wDA3eN6urbwGYD/UNYWmT0hBUGoqFwwmCGv9oFWXHE8u3h6tMV
+aeix9kmKvF9h4GRe0+sqKoK44rQsbmrVjIAzSmjTyuqjmdppEjNboPIVGh109g5m
+7n6tw8BmIk3amQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpel.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpel.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ufpel.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpel.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpel.edu.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpel.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxMDAuBgNVBAoTJ1VGUGVsIC0g
+VW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVsb3RhczESMBAGA1UECxMJQ1RJLVJl
+ZGVzMSEwHwYJKoZIhvcNAQkBFhJyZWRlc0B1ZnBlbC5lZHUuYnIxEDAOBgNVBAcT
+B1BlbG90YXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
+UjEaMBgGA1UEAxMRY2FmZS51ZnBlbC5lZHUuYnIwHhcNMTYwMjAzMTI0MjU4WhcN
+MTkwMjAyMTI0MjU4WjCBwDEwMC4GA1UEChMnVUZQZWwgLSBVbml2ZXJzaWRhZGUg
+RmVkZXJhbCBkZSBQZWxvdGFzMRIwEAYDVQQLEwlDVEktUmVkZXMxITAfBgkqhkiG
+9w0BCQEWEnJlZGVzQHVmcGVsLmVkdS5icjEQMA4GA1UEBxMHUGVsb3RhczEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFj
+YWZlLnVmcGVsLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKe6wNljSw+nFuwJHZWc9LEPraUrwTUmxVrZ7GQCrWQmw6Sci5cJU+qHGfN8r/Ca
+X/VqkJPk9IheSpzsvU+Jj5X0TUmG5HBhVHc5zsDaGdLxTmPPL8tMS8ZNJpzU7/vY
+JEH3rOYmW6ZQI44tiO+1/xS2NVBbDAd0QqNcz11tjSSe59Zg0mVi4xSePCcYT295
+B0ZcEkeFmPX38SZ8gw3AOGlCBmFFhkjUZ1WO1/K3qJpL716HJU2GlaZ4gB4FS2dz
+VbeebsT/hon8Pc+OkqZnJUiL3BrKkoPF0OhgP99ZAzb+Zp60lMzPbCd4oz3aJSh7
+23cIyqy1RDSvJX6Mn9XmKrsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi3uyG/Sn
+FTbkDgpF1bK82QPwDs06lwy8Nf1Ob0lYCn9m76OIk4deCeBTTak98bLyN0VVmMUU
+CFsMMonKBkyDOOA3HZYZ5cxBw+3PZLa8Vb8PJ4siub9cgO+VMhN5sLrLU9LLf7H+
+Y0s+csJy3VSpe77RY+orKjNZHN9znrJN2tHYUtvsuhzQhDddEJ14y4XbHbao1KD6
+EXoDP3ldJUoUo3wDA3eN6urbwGYD/UNYWmT0hBUGoqFwwmCGv9oFWXHE8u3h6tMV
+aeix9kmKvF9h4GRe0+sqKoK44rQsbmrVjIAzSmjTyuqjmdppEjNboPIVGh109g5m
+7n6tw8BmIk3amQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpel.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpel.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UFPel - Universidade Federal de Pelotas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UFPel - Universidade Federal de Pelotas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ufpel.edu.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ufpel.edu.br</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>CTI Redes</md:SurName>
+ <md:EmailAddress>redes@ufpel.edu.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index 0e9858df..00000000
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.crous-lyon.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-28T18:15:13Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lyon.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CROUS Lyon-Personnels</mdui:DisplayName>
- <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACMuAAAjLgAAAAAAAAAAAAAAAAAAAAAAABMG4wATBuMHEwbjShMG46oTBuPmEwbj/BMG4/0TBuPmEwbjqxMG40sTBuMHEwbjAAAAAAAAAAAAEwbjABMG4wATBuMZEwbjlBMG4+8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuPwEwbjlRMG4xkTBuMAEwbjABMG4wATBuMZEwbjshMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuOzEwbjGhMG4wATBuMGEwbjkxMG4/8TBuP/Ewbj/xMG4/8TBuP/EgXj/xEE4/8SBeP/EgXj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjShMG4+4TBuP/Ewbj/xMG4/8TBuP/Ewbj/xwP5P81Kuf/KB3m/x4S5P8TBuP/Ewbj/xMG4/8TBuPuEwbjTBMG46gTBuP/Ewbj/xMG4/8TBuP/Ewbj/xIF4/8xJuf/WlLs/1xU7P9DOen/EQTj/xIF4/8QA+P/EQTj/xAD46oTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/OC7n/zsw6P8rIOb/Ihbl/z406P8lGeX/PTPo/ywg5v9COOnlEwbj+xMG4/8TBuP/Ewbj/xMG4/8RBOP/LiLm/3Rt7/9RSOr/bmfu/2Rc7f+OifL/fHXv/4uG8f55cu//nJfz+xMG4/sTBuP/Ewbj/xMG4/8TBuP/EgTj/ywg5v91bu//VUzr/0k/6f9PRur/ZFvt/0pA6v9GPOn+TEPq/2tk7vwTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/MSXn/zUq5/8TBuP/EgXj/xIF4/8RBOP/EgXj/xEE4/8SBePlEwbjqBMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xEE4/8RBOP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/EwbjqRMG40oTBuPtEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7hMG40sTBuMGEwbjkhMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjABMG4xgTBuOxEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG47ITBuMZEwbjABMG4wATBuMAEwbjGBMG45ITBuPvEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7xMG45MTBuMZEwbjABMG4wAAAAAAAAAAABMG4wATBuMHEwbjSRMG46gTBuPkEwbj/BMG4/wTBuPlEwbjqRMG40oTBuMHEwbjAAAAAAAAAAAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==</mdui:Logo>
- <mdui:InformationURL xml:lang="fr">http://www.crous-lyon.fr</mdui:InformationURL>
- <mdui:Description xml:lang="en">personnel</mdui:Description>
- <mdui:DisplayName xml:lang="fr">CROUS Lyon-Personnels</mdui:DisplayName>
- <mdui:Description xml:lang="fr">personnel</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
-DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
-SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
-NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
-RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
-EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
-eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
-Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
-AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
-TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
-KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
-var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
-uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
-xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
-A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
-rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
-aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
-uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.crous-lyon.fr/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lyon.fr</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
-DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
-SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
-NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
-RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
-EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
-eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
-Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
-AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
-TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
-KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
-var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
-uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
-xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
-A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
-rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
-aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
-uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.crous-lyon.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">CROUS Lyon-Personnels</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">CROUS Lyon-Personnels</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.crous-lyon.fr</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>sinfo@crous-lyon.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
index 93c87541..853c48f9 100644
--- a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
@@ -28,6 +28,14 @@
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/df9b663261436f0d31a332a5e17161b1"/>
</md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="nl">Clusius College</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Clusius College</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="nl">Clusius College</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Clusius College</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="nl">http://www.clusius.nl</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.clusius.nl</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>SURFconext support</md:GivenName>
<md:EmailAddress>support@surfconext.nl</md:EmailAddress>
diff --git a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
deleted file mode 100644
index da7fa6e1..00000000
--- a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dl.acm.org/oa/metadata">
- <!--
- This is an OpenAthens 2 SP for Association for Computing Machinery, Inc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
- Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
- YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
- 8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
- jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
- ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
- GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
- 2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
- 8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
- QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
- EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
- fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
- ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
- 3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
- 6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
- KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
- Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
- YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
- 8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
- jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
- ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
- GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
- 2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
- 8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
- QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
- EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
- fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
- ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
- 3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
- 6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
- KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dl.acm.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.acm.org/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Asad</GivenName>
- <SurName>Ali</SurName>
- <EmailAddress>mailto:ali@acm.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Adam</GivenName>
- <SurName>Greenberg</SurName>
- <EmailAddress>mailto:greenberg@acm.org</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..48c05039
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ed.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public" TOPdesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T08:56:17Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDrzCCApegAwIBAgIJAMVROTQuFXoxMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1MFoXDTI2MDMzMDEyNTc1MFowQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQDBSIaEqZsBLHTmdv2pTau02z5iX2M+Y/I7rY3SBWy/is2bfuBuEzPS58oPMeHi
+ wFjfr8CAPQ2bQ32GK3lbvQzVAZqwabe+s+hcsdLFSmm26GxrmgbiL/U1Inx32gHL
+ 8Y494i1DNURJl7ImhY1LtSQBg81C/7uOf1P6pDoWQcUSooN+I0WLKVf4S5JGU4WW
+ 7uCUGFTVIEGFwveU4cpE/B1i6kuu1zq1n3X0zRyFG1Uu34fzujM8+0rlh/w9yl67
+ hq8qAHL/9j0909WXeaOXj/TPYSRISQCnq2biEmzOb09Jb/2/5gRFUSRVxh3fm5HT
+ P1YDRav07OAGGhSmC75JTJvJAgMBAAGjgaUwgaIwHQYDVR0OBBYEFPHFACKjBapO
+ RoiScm580WU4EzPbMHMGA1UdIwRsMGqAFPHFACKjBapORoiScm580WU4EzPboUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAMVROTQuFXoxMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAFOywZTwbtNhO4YAicWZ1MLcJoZnD3diuQhccHKO
+ zaWZJju/OxbF4rurP3BH0rqJxruXwksD3bk45PKKTb6jLlBkRsqaTrSRL/Z/M6Hs
+ NWy1pBAjP4EMEB+2Tmnikqx/e6BdfhogcPAwFAtup6u9H+kFY/tzprNH20q+07Gk
+ yFKCJJwKZac1TFHLGA6PIzVFOuNqyFQGFqxVew/oL94UCJTTwtLTTuIPvpZaCTo+
+ IyjlIMVigvenyr68jnkrJCgsberkaoPyxP00uK4QvdA0E9by1SvwNVy420Kvvb6+
+ x/fFAXseVm8uRjmuM2HiffZhqgSKm1X1S4+nJ6HXYjGo8+g=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDrzCCApegAwIBAgIJAMVROTQuFXoxMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1MFoXDTI2MDMzMDEyNTc1MFowQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQDBSIaEqZsBLHTmdv2pTau02z5iX2M+Y/I7rY3SBWy/is2bfuBuEzPS58oPMeHi
+ wFjfr8CAPQ2bQ32GK3lbvQzVAZqwabe+s+hcsdLFSmm26GxrmgbiL/U1Inx32gHL
+ 8Y494i1DNURJl7ImhY1LtSQBg81C/7uOf1P6pDoWQcUSooN+I0WLKVf4S5JGU4WW
+ 7uCUGFTVIEGFwveU4cpE/B1i6kuu1zq1n3X0zRyFG1Uu34fzujM8+0rlh/w9yl67
+ hq8qAHL/9j0909WXeaOXj/TPYSRISQCnq2biEmzOb09Jb/2/5gRFUSRVxh3fm5HT
+ P1YDRav07OAGGhSmC75JTJvJAgMBAAGjgaUwgaIwHQYDVR0OBBYEFPHFACKjBapO
+ RoiScm580WU4EzPbMHMGA1UdIwRsMGqAFPHFACKjBapORoiScm580WU4EzPboUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAMVROTQuFXoxMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAFOywZTwbtNhO4YAicWZ1MLcJoZnD3diuQhccHKO
+ zaWZJju/OxbF4rurP3BH0rqJxruXwksD3bk45PKKTb6jLlBkRsqaTrSRL/Z/M6Hs
+ NWy1pBAjP4EMEB+2Tmnikqx/e6BdfhogcPAwFAtup6u9H+kFY/tzprNH20q+07Gk
+ yFKCJJwKZac1TFHLGA6PIzVFOuNqyFQGFqxVew/oL94UCJTTwtLTTuIPvpZaCTo+
+ IyjlIMVigvenyr68jnkrJCgsberkaoPyxP00uK4QvdA0E9by1SvwNVy420Kvvb6+
+ x/fFAXseVm8uRjmuM2HiffZhqgSKm1X1S4+nJ6HXYjGo8+g=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..c931a7d9
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ed.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T08:58:23Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDrzCCApegAwIBAgIJAKj/uVWYBQrKMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1M1oXDTI2MDMzMDEyNTc1M1owQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQCqrCvKLV1axFbGxCwT8E+BbMcGKXuG180hmZPwSXsrrAWg6ErYjOORQ2UCw2Xp
+ tVam+WiuRdpxHrtoT7tCM2VHrKcMleWhXPvSsoH6EZ3kzFVCgojnhCg6IiCpoG/7
+ n32HuoD8kWEKyKTrPeOriDz2LIgdMI2EWFFgLK2r9vBo8Ko7ANiGzgymnRyQSQjQ
+ gaHAgUowjFBxjH/0MOFut4rrCgA7o/7w46eBv5JpAvnrCBikfbiguQf36WACA1Qz
+ 307fSVQL7R60/KULWGmRoXjWWPSgCtyspnP8ILG/v+HlQag5ExDKcx36flIvwmp2
+ n3MsNNYVrXFt7Nn08Gec4ka/AgMBAAGjgaUwgaIwHQYDVR0OBBYEFOfVReESELZa
+ C7UqM5LhyvTG1uEDMHMGA1UdIwRsMGqAFOfVReESELZaC7UqM5LhyvTG1uEDoUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAKj/uVWYBQrKMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAHGzM2Pw3YkZy8lZrKHzXhTOM74v9hMiBJgQw9/d
+ b/NV7HdY3Qd0DuQfM1jlCiOzfh/tIF6Fh45NbuYcGZ5Aw6NeWg1H/Yd9OEDxdEnR
+ ChRBqMu3LFuaUk+88gnyCGg8hS2R00RNHIzYlXlh+JgWnE+/2q5tGFQ8CfMl95XG
+ 50w/eWY19/pfqosdNZyutk/tXwzHPcrI+n8iW2JkUe9Gasfg7JvQeCNpoF2erM4v
+ EvEue9SE6lLcP4L5gVPVo0ibvIIWUPIYVXjbKCDZjBgOWafwklfYdRbclNyPSSVq
+ vzrXt+sPz4+CBoOXgthUcvZwFNzMBoIm2wWZdJn4RI38rHA=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDrzCCApegAwIBAgIJAKj/uVWYBQrKMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1M1oXDTI2MDMzMDEyNTc1M1owQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQCqrCvKLV1axFbGxCwT8E+BbMcGKXuG180hmZPwSXsrrAWg6ErYjOORQ2UCw2Xp
+ tVam+WiuRdpxHrtoT7tCM2VHrKcMleWhXPvSsoH6EZ3kzFVCgojnhCg6IiCpoG/7
+ n32HuoD8kWEKyKTrPeOriDz2LIgdMI2EWFFgLK2r9vBo8Ko7ANiGzgymnRyQSQjQ
+ gaHAgUowjFBxjH/0MOFut4rrCgA7o/7w46eBv5JpAvnrCBikfbiguQf36WACA1Qz
+ 307fSVQL7R60/KULWGmRoXjWWPSgCtyspnP8ILG/v+HlQag5ExDKcx36flIvwmp2
+ n3MsNNYVrXFt7Nn08Gec4ka/AgMBAAGjgaUwgaIwHQYDVR0OBBYEFOfVReESELZa
+ C7UqM5LhyvTG1uEDMHMGA1UdIwRsMGqAFOfVReESELZaC7UqM5LhyvTG1uEDoUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAKj/uVWYBQrKMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAHGzM2Pw3YkZy8lZrKHzXhTOM74v9hMiBJgQw9/d
+ b/NV7HdY3Qd0DuQfM1jlCiOzfh/tIF6Fh45NbuYcGZ5Aw6NeWg1H/Yd9OEDxdEnR
+ ChRBqMu3LFuaUk+88gnyCGg8hS2R00RNHIzYlXlh+JgWnE+/2q5tGFQ8CfMl95XG
+ 50w/eWY19/pfqosdNZyutk/tXwzHPcrI+n8iW2JkUe9Gasfg7JvQeCNpoF2erM4v
+ EvEue9SE6lLcP4L5gVPVo0ibvIIWUPIYVXjbKCDZjBgOWafwklfYdRbclNyPSSVq
+ vzrXt+sPz4+CBoOXgthUcvZwFNzMBoIm2wWZdJn4RI38rHA=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
deleted file mode 100644
index beaa26a8..00000000
--- a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduid.jamu.cz/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-11-08T10:04:45Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamu.cz</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for employees and students of the Janacek Academy of Music and Performing Arts in Brno</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Janáčkovy akademie múzických umění v Brně</mdui:Description>
- <mdui:Logo height="113" width="111">https://www.jamu.cz/graphics/janacek.png</mdui:Logo>
- </mdui:UIInfo>
- <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
- <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
- </eduidmd:RepublishRequest>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.cz/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eduid.jamu.cz/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.cz/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamu.cz</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://english.jamu.cz/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="cs">http://www.jamu.cz/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jaroslav</md:GivenName>
- <md:SurName>Meixner</md:SurName>
- <md:EmailAddress>meixner@jamu.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
deleted file mode 100644
index 28c343b8..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oa/metadata">
- <!--
- This is a "UK Education Store" OpenAthens SP for Adept Scientific plc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-04T10:38:08Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Adept Scientific UK Education Store</mdui:DisplayName>
- <mdui:Description xml:lang="en">Fast track access to low software prices for students and educators with no post purchase verification. If you are a student at an organisation that has a site licence, you may also be eligible for special reduced prices for personal licences.</mdui:Description>
- <mdui:Logo height="164" width="207">https://edustore.adeptscience.co.uk/images/Adept-LH-logo-store-WEB.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
- MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
- DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
- ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
- LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
- c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
- bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
- sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
- 6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
- cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
- CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
- DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
- AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
- cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
- AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
- U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
- dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
- Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
- BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
- lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
- b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
- 2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
- plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
- YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
- jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
- CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
- MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
- DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
- ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
- LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
- c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
- bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
- sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
- 6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
- cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
- CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
- DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
- AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
- cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
- AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
- U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
- dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
- Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
- BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
- lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
- b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
- 2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
- plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
- YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
- jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
- CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Adept Scientific UK Education Store</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/about/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
deleted file mode 100644
index 69cdb940..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oasp">
- <!--
- This is an OpenAthens SP for Adept Scientific plc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
- MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
- DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
- ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
- LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
- c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
- bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
- sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
- 6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
- cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
- CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
- DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
- AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
- cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
- AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
- U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
- dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
- Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
- BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
- lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
- b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
- 2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
- plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
- YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
- jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
- CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
index ec0f08c1..f61f8889 100644
--- a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
@@ -48,8 +48,7 @@
<md:OrganizationURL xml:lang="en">http://uniwise.dk</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe.wiseflow.net.xml b/swamid-interfederations-2.0/europe.wiseflow.net.xml
index f52e0002..403e7561 100644
--- a/swamid-interfederations-2.0/europe.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe.wiseflow.net.xml
@@ -48,8 +48,7 @@
<md:OrganizationURL xml:lang="en">http://uniwise.dk</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
index b8c7ddf7..a2b06f14 100644
--- a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
@@ -13,6 +13,9 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nebraska.edu</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">University of Nebraska</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.nebraska.edu/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.nebraska.edu/bylaws-and-policies.html</mdui:PrivacyStatementURL>
+ <mdui:Logo height="75" width="284" xml:lang="en">https://fed.nebraska.edu/idp/images/un_master_bk_incommon.jpg</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
deleted file mode 100644
index d9b4d642..00000000
--- a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fed.nhtv.nl/adfs/services/trust">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-08-09T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Description xml:lang="nl">NHTV internationaal hoger onderwijs Breda</mdui:Description>
- <mdui:Description xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Description>
- <mdui:Logo height="48" width="78">https://static.surfconext.nl/logos/idp/nhtv.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">NHTV Breda University of Applied Sciences Nationale Hogeschool voor Toerisme en Verkeer</mdui:Keywords>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d5f955107c70b084e9df9a1e8261e973"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationName>
- <md:OrganizationName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="nl">http://www.nhtv.nl</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.nhtv.nl</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
deleted file mode 100644
index 1dbaa255..00000000
--- a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.clusius.nl/adfs/services/trust">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-23T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="nl">Clusius College (old)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Clusius College (old)</mdui:DisplayName>
- <mdui:Description xml:lang="nl">Clusius College</mdui:Description>
- <mdui:Description xml:lang="en">Clusius College</mdui:Description>
- <mdui:Logo height="37" width="108">https://static.surfconext.nl/logos/idp/clusius.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Clusius College MBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Clusius College MBO</mdui:Keywords>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/47d9881f7198a3e15644c76503f0402d"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Clusius College (old)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Clusius College (old)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
index c004ee9f..263b143f 100644
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
@@ -20,6 +20,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDVzCCAj+gAwIBAgIUKmBCYXflPLtHr7RZnoMPn/DvtmgwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTEz
+MDIwNTEzMTQxNVoXDTMzMDIwNTEzMTQxNVowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAnGjACvIl7EYKjKCH0NF4ebs+TiUOvceisAhINr5e4O/BgsEV0pdwWky84VW4
+34IOhhS1OZfNof3DGqIFjIG10D+MMYR56+VWjLV1l4jTzPhxEM1Da4B9opclIqfa
+TuvYTG5taAQ0zH5F0/igiQwgfdQnb8JUb4GlKfvjrwGBEBrV4EdCwuII5gPTWlJP
+q5g5b4fYuLoCxpd21mzi85oVMB39IHCi8r3hlVHvnmdPCINW7DGF9ZSeQzmhJnCB
+D6qm+tOmLtj8PJTNvQ+w89BYCbcdEUOIc8QnGPcupP3eYbp3O03YE4Dslwxed2pT
+S/rBd8Nug44TIPqTPX5V7DaRNQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
+ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQs9Bw6sfV70qXt48wu
+K1zo2uyoYzANBgkqhkiG9w0BAQUFAAOCAQEAY3y7sMljpfd/g1fNhDxnOYRevqi1
+Ee88d37yE/yVPapmcSHdIzV6vrDl+g+2cD1+sPB5Y5dMVixiptVX5+1ey55Mpb4e
+MTzmP7yDaL1eHKN+7NndjBOdF8nXheaB+/PRXuwp3dlSQrumH2kIPGA2iLHXHDlp
+ytKmSaXH1HkcgcjQe5cgHinQd9sA22s4pMJ309e6Y/8+IUq7Vc75+1YrnnDHF7mx
+XwWUOQkoMHoHa30vcT2jQVKThDWJj7WLPSDv9t0CTUy8ToOSBTfvooHJOZhsLQzG
+Igfeq0NJEYoEobPu+TwPdcY7Mzham8UC11Kt0r95Ti9Wpfe7OfMDHhPmfA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
@@ -49,39 +75,6 @@ hjz3pTN+SFo=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/POST/SSO"/>
@@ -97,6 +90,32 @@ HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDVzCCAj+gAwIBAgIUKmBCYXflPLtHr7RZnoMPn/DvtmgwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTEz
+MDIwNTEzMTQxNVoXDTMzMDIwNTEzMTQxNVowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAnGjACvIl7EYKjKCH0NF4ebs+TiUOvceisAhINr5e4O/BgsEV0pdwWky84VW4
+34IOhhS1OZfNof3DGqIFjIG10D+MMYR56+VWjLV1l4jTzPhxEM1Da4B9opclIqfa
+TuvYTG5taAQ0zH5F0/igiQwgfdQnb8JUb4GlKfvjrwGBEBrV4EdCwuII5gPTWlJP
+q5g5b4fYuLoCxpd21mzi85oVMB39IHCi8r3hlVHvnmdPCINW7DGF9ZSeQzmhJnCB
+D6qm+tOmLtj8PJTNvQ+w89BYCbcdEUOIc8QnGPcupP3eYbp3O03YE4Dslwxed2pT
+S/rBd8Nug44TIPqTPX5V7DaRNQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
+ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQs9Bw6sfV70qXt48wu
+K1zo2uyoYzANBgkqhkiG9w0BAQUFAAOCAQEAY3y7sMljpfd/g1fNhDxnOYRevqi1
+Ee88d37yE/yVPapmcSHdIzV6vrDl+g+2cD1+sPB5Y5dMVixiptVX5+1ey55Mpb4e
+MTzmP7yDaL1eHKN+7NndjBOdF8nXheaB+/PRXuwp3dlSQrumH2kIPGA2iLHXHDlp
+ytKmSaXH1HkcgcjQe5cgHinQd9sA22s4pMJ309e6Y/8+IUq7Vc75+1YrnnDHF7mx
+XwWUOQkoMHoHa30vcT2jQVKThDWJj7WLPSDv9t0CTUy8ToOSBTfvooHJOZhsLQzG
+Igfeq0NJEYoEobPu+TwPdcY7Mzham8UC11Kt0r95Ti9Wpfe7OfMDHhPmfA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
@@ -126,39 +145,6 @@ hjz3pTN+SFo=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
deleted file mode 100644
index 41bd866b..00000000
--- a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.hanze.nl/adfs/services/trust">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-12T10:50:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="nl">Hanzehogeschool Groningen</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Hanze University of Applied Sciences</mdui:DisplayName>
- <mdui:Description xml:lang="nl">Hanzehogeschool Groningen</mdui:Description>
- <mdui:Description xml:lang="en">Hanze University of Applied Sciences</mdui:Description>
- <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/hanze.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">hanze university groningen hanzehogeschool groningen hbo applied sciences</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">hanze university groningen hanzehogeschool groningen hbo</mdui:Keywords>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/193a3229f49c46a0b0a0f063f44b7696"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="nl">https://www.hanze.nl/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">https://www.hanze.nl/eng</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
deleted file mode 100644
index 2131d427..00000000
--- a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
- <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://fod.geant.net/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GÉANT FoD pilot</mdui:DisplayName>
- <mdui:Description xml:lang="en">GÉANT FoD pilot</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://fod.geant.net/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://fod.geant.net/</mdui:PrivacyStatementURL>
- <mdui:Logo height="45" width="220" xml:lang="en">https://fod.geant.net/static/fodlogo2.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>fod.geant.net</ds:KeyName>
- <ds:KeyName>https://fod.geant.net/shibboleth</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=fod.geant.net</ds:X509SubjectName>
- <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJALpwpqVM41ahMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWZvZC5nZWFudC5uZXQwHhcNMTQwNjIzMTAwMDQ3WhcNMTkwNjIyMTAwMDQ3
- WjAYMRYwFAYDVQQDEw1mb2QuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEA7xERTh1Nm2VyuqI9t3nPILhB0OT2gwNZZYQ7S0YWDbwQSZu8
- 98n9ky46onJm6ie3hA3CQKO86/0IqoF8idhnMFrODrvVNL+MTXj/kfb3oRwm0HzR
- ZXOExZM4zCLCaAAmlIvkYASjjRrY8tZnyXkw1IXE/wApfU4foL8as0Wskq3vQgvm
- dL9xXc+T7CsR7ZkvzgekLw8IhXT8zwoiKKWzw7cNJMr0yvkow2El0GJevpT4H1n4
- B0L4WeipLH3grmBa4vL7fjOnBomnou6mjbfeKy3e0sbeMq64fLeJoJyDdoxx8s3r
- uketgyYh5BG7Z6tFpHVrrQ5lxqAk8eSOC+tziwIDAQABo10wWzA6BgNVHREEMzAx
- gg1mb2QuZ2VhbnQubmV0hiBodHRwczovL2ZvZC5nZWFudC5uZXQvc2hpYmJvbGV0
- aDAdBgNVHQ4EFgQUWYtmspsehNvR1pD1f1+qEUfoDEIwDQYJKoZIhvcNAQEFBQAD
- ggEBAHV/TTiiQGeGW3YhuyV5dA+FkSNPMJbYPi38Oy36Vv732NYv22ONtKjop45I
- LVz6tPVLtpV+TVwtSGw+Rca79FwDf6g3tu2rLN+xElLk8M7gYtoRY2kdoq1A/UaO
- 51L2b9wEqYcXQMig2hRwdtxSUgfRcGSwDO75us6b6OsSs3L1UZoWgsHbyynT04Hz
- +pgaYx67ZJZZ7Mb26w1ScHJUenjHhFY3Xqr/yG6+cwmA/7ihdnpwyOp8VGLA8kKD
- Faf69w08P93wE8CS9U+gcN8RdvhC9W+iYhGRLHCPg7o6gRjeFB+p6zeyb/kNuuLU
- VYAFoJvsnMeKzPxMe+iSHgeolLI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fod.geant.net/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SLO/Artifact"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fod.geant.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fod.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fod.geant.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AttributeConsumingService index="0" isDefault="true">
- <md:ServiceName xml:lang="en">GÉANT FoD pilot</md:ServiceName>
- <md:ServiceDescription xml:lang="en">GÉANT FoD pilot</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
- <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Leonidas</md:GivenName>
- <md:SurName>Poulopoulos</md:SurName>
- <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Leonidas</md:GivenName>
- <md:SurName>Poulopoulos</md:SurName>
- <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
index 8787f105..abdaa91b 100644
--- a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forge.switch.ch/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-27T15:54:56Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-06T06:41:43Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -91,15 +91,15 @@ D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
<md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="support">
- <md:GivenName>SWITCHaai</md:GivenName>
+ <md:GivenName>forge</md:GivenName>
<md:SurName>Team</md:SurName>
- <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+ <md:EmailAddress>mailto:support@switch.ch</md:EmailAddress>
<md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:GivenName>Lukas</md:GivenName>
- <md:SurName>Hämmerle</md:SurName>
- <md:EmailAddress>mailto:lukas.haemmerle@switch.ch</md:EmailAddress>
- <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+ <md:GivenName>Fergus</md:GivenName>
+ <md:SurName>Kerins</md:SurName>
+ <md:EmailAddress>mailto:fergus.kerins@switch.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 44 268 15 42</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
deleted file mode 100644
index ad461be3..00000000
--- a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fr-rennes1-shibboleth.moveon4.com/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-10T13:01:10Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>https://federation.renater.fr/category/logiciel</saml:AttributeValue>
- <saml:AttributeValue>https://federation.renater.fr/scope/commercial</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">MoveON - software for international activity management</mdui:DisplayName>
- <mdui:InformationURL xml:lang="fr">https://moveon4.com/513</mdui:InformationURL>
- <mdui:Description xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</mdui:Description>
- <mdui:DisplayName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</md:ServiceName>
- <md:ServiceName xml:lang="en">MoveON - software for international activity management</md:ServiceName>
- <md:ServiceDescription xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">QS UNISOLUTION</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">QS UNISOLUTION</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Kamran Tabassum</md:SurName>
- <md:EmailAddress>kamran@zeptosystems.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
index a5722f1e..6a96c976 100644
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -13,7 +13,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Digimap Collections</mdui:DisplayName>
<mdui:Description xml:lang="en">Online maps and spatial data of Great Britain</mdui:Description>
- <mdui:Logo height="90" width="350">https://vsp2.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
+ <mdui:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
index f4ab8b45..626005fc 100644
--- a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
@@ -46,8 +46,8 @@
<md:OrganizationURL xml:lang="en">http://www.sdu.dk/en/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:GivenName>Lasse</md:GivenName>
+ <md:SurName>Birnbaum Jensen</md:SurName>
+ <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
new file mode 100644
index 00000000..896d5df9
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisalento.it/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Salento</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Università del Salento</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for the users of University of Salento</mdui:Description>
+ <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università del Salento</mdui:Description>
+ <mdui:InformationURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
+NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
+hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
+0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
+g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
+Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
+XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
+lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
+Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
+vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
+OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
+8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
+i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
+t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
+TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
+cwGgvFbTug==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisalento.it/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisalento.it/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisalento.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisalento.it/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
+NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
+hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
+0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
+g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
+Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
+XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
+lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
+Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
+vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
+OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
+8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
+i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
+t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
+TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
+cwGgvFbTug==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Università del Salento</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Salento</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Università del Salento</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Salento</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.unisalento.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://international.unisalento.it/about</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Antonio Campa</md:SurName>
+ <md:EmailAddress>mailto:dorsale@unisalento.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
index ec8abe54..9614dbd9 100644
--- a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
@@ -9,10 +9,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GENCI</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">RENATER Connect</mdui:DisplayName>
<mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
<mdui:Description xml:lang="en">IdP Hosting</mdui:Description>
- <mdui:DisplayName xml:lang="fr">GENCI</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">RENATER Connect</mdui:DisplayName>
<mdui:Description xml:lang="fr">IdP Hosting</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
@@ -83,8 +83,8 @@ eTynT1A7tmOPmxyMyv76cficIt0xGao=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">GENCI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">GENCI</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">RENATER Connect</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">RENATER Connect</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
index 79007840..99fc1912 100644
--- a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
@@ -84,9 +84,9 @@ iVr4j+vsHmoBJB+J5VAC8/SAzG/s4VDMBZ2yqMvzeEXkmaOTrso=
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/Redirect/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST/SSO"/>
</md:IDPSSODescriptor>
<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<md:Extensions>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index a94e8911..ffe0cfe7 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -100,7 +100,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgtsizola.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmetlika.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmsn.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrusevec.si</shibmd:Scope>
@@ -418,6 +417,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jela-janezica.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slodrs.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostpavcka.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.ostpavcka.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-konjice-zrece.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cresnjevec.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssgt-mb.si</shibmd:Scope>
@@ -525,6 +525,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vperka.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmedvode.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikapolana.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-velikapolana.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonetacufarja.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tinje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-tinje.si</shibmd:Scope>
@@ -542,6 +543,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-store.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osradlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1os-zalec.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.1os-zalec.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptrubar.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpcrensovci.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ravne.si</shibmd:Scope>
@@ -578,6 +580,18 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrecica.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voranc.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbovec.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-razkrizje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srednjasolaizola.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-slovenskabistrica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zelenajama.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stari-trg-ok.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koprivnica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vransko.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfpkr.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjdol.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-malanedelja.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-montessori.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pei.si</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
<mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index 8e97b844..918903ce 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -18,14 +18,14 @@
<mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
<mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
- <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
<mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
+ <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
<mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
<mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
<mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
<mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>abo.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
deleted file mode 100644
index a0a1af26..00000000
--- a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed2.openathens.net/openathens">
- <!--
- This is an OpenAthens MD "athukfed2" IdP for Eduserv.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-29T10:19:00Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
deleted file mode 100644
index 0bf96500..00000000
--- a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed3.openathens.net/openathens">
- <!--
- This is an "athukfed3" OpenAthens MD Test IdP for Eduserv.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-12T16:04:09Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfederation"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed3</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
deleted file mode 100644
index 5980e81a..00000000
--- a/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed4.openathens.net/openathens">
- <!--
- This is an "athukfed4" OpenAthens MD Test IdP for Eduserv.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T13:51:09Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67475576"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67475576"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed4</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
deleted file mode 100644
index 9a6690e2..00000000
--- a/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed5.openathens.net/openathens">
- <!--
- This is an "athukfed5" OpenAthens MD Test IdP for Eduserv.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T13:51:09Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67484437"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67484437"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
- DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
- BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
- MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
- cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
- SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
- ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
- ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
- c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
- jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
- 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
- udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
- MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
- hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
- UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
- fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
- +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
- d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
- 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
- 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
- NE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed5</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Athens Helpdesk</GivenName>
- <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
index 141e9761..674177f5 100644
--- a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
@@ -102,8 +102,7 @@
<EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Houghton</SurName>
- <EmailAddress>mailto:houghtonr@chesterfield.ac.uk</EmailAddress>
+ <GivenName>Helpdesk</GivenName>
+ <EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
index bd450df8..2ed3a0da 100644
--- a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
@@ -24,6 +24,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
+BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
+cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
+kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
+H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
+UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
+yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
+AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
+cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
+Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
+oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
+vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
+ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
+LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
+rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
@@ -62,6 +94,38 @@ N+v+oW0soUwCiTs30w==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
+BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
+cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
+kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
+H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
+UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
+yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
+AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
+cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
+Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
+oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
+vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
+ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
+LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
+rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
diff --git a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
index 6fdbbf7f..14f00c75 100644
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
@@ -18,14 +18,14 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvgz.cas.cz</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Global Change Research Centre AS CR</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider GCRC AV CR employees.</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CVGZ AV ČR</mdui:Description>
+ <mdui:DisplayName xml:lang="en">Global Change Research Institute CAS</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider GCRI AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚVGZ AV ČR</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
<mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
- <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-cvgz-44.png</mdui:Logo>
- <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-cvgz-148.png</mdui:Logo>
+ <mdui:Logo height="44" width="119">https://jiftach.cas.cz/loga/logo-uvgz-44.png</mdui:Logo>
+ <mdui:Logo height="137" width="371">https://jiftach.cas.cz/loga/logo-uvgz-137.png</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -103,10 +103,10 @@ Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Global Change Research Centre AS CR</md:OrganizationName>
- <md:OrganizationName xml:lang="cs">Centrum výzkumu globální změny AV ČR</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Global Change Research Centre AS CR, v. v. i.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Global Change Research Institute CAS</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Ústav výzkumu globální změny AV ČR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Global Change Research Institute CAS, v. v. i.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</md:OrganizationURL>
<md:OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..adc7ac5e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.efc.ac.uk/idp/shibboleth">
+ <!--
+ This is an IdP for Epping Forest College.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-11T12:54:58Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Epping Forest College</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Epping Forest College Shibboleth IdP</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNTw5TLO9Ge/T8f0r55g3oYeWEIcsunU
+ 7e0Mqn3f5Bx+9Jq2gPKKoKJwGAbM44ZHp9kT2lv9fbgLoqV4wsN5kAaUyQ0V1I2T
+ R2HQ1WGYaYyB0NQFZB30SVZ/NA446OO7/JQjvC6UrgDjLlh+tHKfvtr9M7p/t5aA
+ OiJK78plnV/YyRkAmGMNjqtqC5UYaknQsRyd5FaKJkmxA/LDtn50yZUDrtmSVCco
+ wGPPAvSjtrtKMXvIOleR7IUd8RTGcLm9FRe0PSMwlq5Wni0E7/VNVD2cbVQ/N4JL
+ cFZkRL6k3hNj8LZvwz8RVm3ihPuPhs9N72ML5+LK2POCZ1zjceC9VwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUCueTLaZVrYTMUiuPwdJTc4lvcNkwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQCAGITy3H8BKF/HwonbKtRsEG1nAlU5I+rTp4/m
+ SW2Hm76+w4xicHWvHiDOOfvOU/xiTJgWRiubpY6Lu2+m4yrArcYGvOdUrw5tB7bQ
+ mZBl/xr6JQAjbqKypBO+W95x3KWFWTtq3vNTRPsW8skCArzhLnJJNg4/nwr2IE4X
+ aEi2HUCZ6uy3OFf9gUAXuUIQIEtWzEfYcu5IXlWYk7H1Jh2qyBVLfdYE4J5zEt/6
+ txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
+ FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
+ BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
+ NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQoowAbiQx7g+RBCwYkM3QolXf8opzpjWr
+ X5kD6C+lc9FyRbPBWUsewQlcKOuNy46ernfLi+K49WKD0bdjffK42Y4c0jhi7XMf
+ Gg2PfD5xSQy3v6A+P6lpbYbxTQlqenUFRb5djFsot8gsKaLdfTGNizE8lPYaMJPw
+ 8ELTmgBdeXkhFFXJCRxEeFTjBstc0HcyVAgnYr8nZEZzpFIUxpi1A81Qcq5OCk7+
+ yph8Gp2Ossneh4L0ZzHKvbCMjxHBhF6zrdneJfTKed9JzYKLm4L0QPvIE46CiAnD
+ oUAz5weBBvdqox6rh3E4Q6mH5+eguiDeLy5jIubyOAq6ai8SelCNAgMBAAGjYTBf
+ MB0GA1UdDgQWBBR/+c7vffPYnB1eNa6B2zavd7rzJDA+BgNVHREENzA1gg1pZHAu
+ ZWZjLmFjLnVrhiRodHRwczovL2lkcC5lZmMuYWMudWsvaWRwL3NoaWJib2xldGgw
+ DQYJKoZIhvcNAQELBQADggEBABepHt+qyj0kAJRbJOo/r85+JGibsxsz6bgezVHx
+ /maSj3XFDgVzC9LjuHG3y8Hd1se4hIWg92RjoC3fBI2x1GjwOdGga7oQHiREv4+V
+ 3wBimcmqztPK8G0U3rGDMeDVy+kyUYMgpdf5MxTFDjLx91FdACMaNTTMigAGWVbw
+ C3srGBGXk0RsEgZD4JkP9LUW91oXuqhxki6kZO+Isyw4PlgazdB4y4Uc+VlCh6y6
+ P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
+ k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/Y=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5NOOh728m29wPobTiOHr6UuEnHccxZR
+ rJ6cCVxWkJMdyb9FVJ53pMWbCmLrMpPl63uxs1LsJN+y+ksmoFEkBledGMhCsBlh
+ INwjraPHgtYdX5tvlOWtPBDvadI7yAjTohmzC18Y4HicGyf+N8wd7o2ZIf8Emkoy
+ xemehjPHPrydJMMYpFjKkh5SJovAiTIIfBXpg/5zUJ8hi8Mm5kSW+5AQVoGensvp
+ pG91nLp+jcaKGawlg0d/pvca0Qrw4eJTFukAKT6U2O7TrC1qpK0GcC/oMmHSC0C8
+ dGAvgwEYWyg5w5WIAQVntzqgWfGlm0RGR0rDStQ7oyhtlOz1lHmMcwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUEGCQsUv3Uai6wzZ7Hwq7hfU3bpMwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQBtbPSWiXrw62ZbVJHSaouA2rV6wtwlbPmuLAhc
+ Z5F6LEtTdyXGkzK/5arRzqXmOjZe/ym4Y25MNf2kgtcL5XDjH0CtryNxJRZEnnRQ
+ St9xyxZjBl41QGNE//h4hiNyFSBERQ8rMgPn/eZ6/C0fD2MYcUjQqY2K0eINHWFK
+ twO/Qhc+Ap85rvUlnxkHJuhOqjQrD0VkENe1Z47Rnx1pyr4RgRt/K8dWHXOpQGBt
+ HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
+ fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.efc.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNTw5TLO9Ge/T8f0r55g3oYeWEIcsunU
+ 7e0Mqn3f5Bx+9Jq2gPKKoKJwGAbM44ZHp9kT2lv9fbgLoqV4wsN5kAaUyQ0V1I2T
+ R2HQ1WGYaYyB0NQFZB30SVZ/NA446OO7/JQjvC6UrgDjLlh+tHKfvtr9M7p/t5aA
+ OiJK78plnV/YyRkAmGMNjqtqC5UYaknQsRyd5FaKJkmxA/LDtn50yZUDrtmSVCco
+ wGPPAvSjtrtKMXvIOleR7IUd8RTGcLm9FRe0PSMwlq5Wni0E7/VNVD2cbVQ/N4JL
+ cFZkRL6k3hNj8LZvwz8RVm3ihPuPhs9N72ML5+LK2POCZ1zjceC9VwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUCueTLaZVrYTMUiuPwdJTc4lvcNkwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQCAGITy3H8BKF/HwonbKtRsEG1nAlU5I+rTp4/m
+ SW2Hm76+w4xicHWvHiDOOfvOU/xiTJgWRiubpY6Lu2+m4yrArcYGvOdUrw5tB7bQ
+ mZBl/xr6JQAjbqKypBO+W95x3KWFWTtq3vNTRPsW8skCArzhLnJJNg4/nwr2IE4X
+ aEi2HUCZ6uy3OFf9gUAXuUIQIEtWzEfYcu5IXlWYk7H1Jh2qyBVLfdYE4J5zEt/6
+ txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
+ FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
+ BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
+ NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQoowAbiQx7g+RBCwYkM3QolXf8opzpjWr
+ X5kD6C+lc9FyRbPBWUsewQlcKOuNy46ernfLi+K49WKD0bdjffK42Y4c0jhi7XMf
+ Gg2PfD5xSQy3v6A+P6lpbYbxTQlqenUFRb5djFsot8gsKaLdfTGNizE8lPYaMJPw
+ 8ELTmgBdeXkhFFXJCRxEeFTjBstc0HcyVAgnYr8nZEZzpFIUxpi1A81Qcq5OCk7+
+ yph8Gp2Ossneh4L0ZzHKvbCMjxHBhF6zrdneJfTKed9JzYKLm4L0QPvIE46CiAnD
+ oUAz5weBBvdqox6rh3E4Q6mH5+eguiDeLy5jIubyOAq6ai8SelCNAgMBAAGjYTBf
+ MB0GA1UdDgQWBBR/+c7vffPYnB1eNa6B2zavd7rzJDA+BgNVHREENzA1gg1pZHAu
+ ZWZjLmFjLnVrhiRodHRwczovL2lkcC5lZmMuYWMudWsvaWRwL3NoaWJib2xldGgw
+ DQYJKoZIhvcNAQELBQADggEBABepHt+qyj0kAJRbJOo/r85+JGibsxsz6bgezVHx
+ /maSj3XFDgVzC9LjuHG3y8Hd1se4hIWg92RjoC3fBI2x1GjwOdGga7oQHiREv4+V
+ 3wBimcmqztPK8G0U3rGDMeDVy+kyUYMgpdf5MxTFDjLx91FdACMaNTTMigAGWVbw
+ C3srGBGXk0RsEgZD4JkP9LUW91oXuqhxki6kZO+Isyw4PlgazdB4y4Uc+VlCh6y6
+ P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
+ k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/Y=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5NOOh728m29wPobTiOHr6UuEnHccxZR
+ rJ6cCVxWkJMdyb9FVJ53pMWbCmLrMpPl63uxs1LsJN+y+ksmoFEkBledGMhCsBlh
+ INwjraPHgtYdX5tvlOWtPBDvadI7yAjTohmzC18Y4HicGyf+N8wd7o2ZIf8Emkoy
+ xemehjPHPrydJMMYpFjKkh5SJovAiTIIfBXpg/5zUJ8hi8Mm5kSW+5AQVoGensvp
+ pG91nLp+jcaKGawlg0d/pvca0Qrw4eJTFukAKT6U2O7TrC1qpK0GcC/oMmHSC0C8
+ dGAvgwEYWyg5w5WIAQVntzqgWfGlm0RGR0rDStQ7oyhtlOz1lHmMcwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUEGCQsUv3Uai6wzZ7Hwq7hfU3bpMwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQBtbPSWiXrw62ZbVJHSaouA2rV6wtwlbPmuLAhc
+ Z5F6LEtTdyXGkzK/5arRzqXmOjZe/ym4Y25MNf2kgtcL5XDjH0CtryNxJRZEnnRQ
+ St9xyxZjBl41QGNE//h4hiNyFSBERQ8rMgPn/eZ6/C0fD2MYcUjQqY2K0eINHWFK
+ twO/Qhc+Ap85rvUlnxkHJuhOqjQrD0VkENe1Z47Rnx1pyr4RgRt/K8dWHXOpQGBt
+ HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
+ fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Epping Forest College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Epping Forest College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.efc.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Robert</GivenName>
+ <SurName>Laryea</SurName>
+ <EmailAddress>mailto:RLARYEA@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Naeem</GivenName>
+ <SurName>Rehman</SurName>
+ <EmailAddress>mailto:nrehman@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Robert</GivenName>
+ <SurName>Laryea</SurName>
+ <EmailAddress>mailto:RLARYEA@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Naeem</GivenName>
+ <SurName>Rehman</SurName>
+ <EmailAddress>mailto:nrehman@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
index 5a088b45..b69cb9f9 100644
--- a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-12-02T16:36:50Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T12:36:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -81,6 +81,31 @@ EyP/QDjoD02nYu++815n4g==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDD7LOez3zrlr+A6IpY1G9Qp5VIA++bAUEe+zZMu7HbkISrqPLAqFWb
+O5cF1vgqfQQKmGYfeITgI2HxeizfXWtF662vI1K18yDX73K+tl0zCy7jmvCKqmeF
+gi31OSbHk2bZR2F9HUwGGkcenidhMKn+kDrEypxelzUjhFUqfw6s7lmxUogOoDdf
+xEQaYKfsCiOIsecI6JJ7VUgm0M3dAqXMmMs3B5K3O4QIjLaFsIRb+joCANL9TUz9
+HFwUZmaR69s5zreWi/FVQF/mMEDeMXTfzyClu692FpWQ7fJns6quoaavSyOBGcOY
+ma8NtVkmkxgO8JjtlwIDqwAWkH8ML6aRAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRe/zKjyhGnk+X89C9ynWEPakNhJjANBgkqhkiG9w0BAQsFAAOCAQEA
+idtG/yOJo1kQVkWxFdD1mO6AY8JbTuJCwbxHUKsWFuyvk/rN74TI1SmYKmt01v7G
+ZnRnrxEiP8nm0+tMZC8GMoBe65XTpa1L6jVD2xK2gVc1R/8GviL5/wfYa652uUCB
+iduzNGuKgsRUqOIXCdRZpnSTazvnKvSE1pwWWbWqvK64IjdZPPc0JLpUx2z1z2YP
+CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
+q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
+pTA8OOnOcAQgmsJXODtWzw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
@@ -120,6 +145,31 @@ EyP/QDjoD02nYu++815n4g==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDD7LOez3zrlr+A6IpY1G9Qp5VIA++bAUEe+zZMu7HbkISrqPLAqFWb
+O5cF1vgqfQQKmGYfeITgI2HxeizfXWtF662vI1K18yDX73K+tl0zCy7jmvCKqmeF
+gi31OSbHk2bZR2F9HUwGGkcenidhMKn+kDrEypxelzUjhFUqfw6s7lmxUogOoDdf
+xEQaYKfsCiOIsecI6JJ7VUgm0M3dAqXMmMs3B5K3O4QIjLaFsIRb+joCANL9TUz9
+HFwUZmaR69s5zreWi/FVQF/mMEDeMXTfzyClu692FpWQ7fJns6quoaavSyOBGcOY
+ma8NtVkmkxgO8JjtlwIDqwAWkH8ML6aRAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRe/zKjyhGnk+X89C9ynWEPakNhJjANBgkqhkiG9w0BAQsFAAOCAQEA
+idtG/yOJo1kQVkWxFdD1mO6AY8JbTuJCwbxHUKsWFuyvk/rN74TI1SmYKmt01v7G
+ZnRnrxEiP8nm0+tMZC8GMoBe65XTpa1L6jVD2xK2gVc1R/8GviL5/wfYa652uUCB
+iduzNGuKgsRUqOIXCdRZpnSTazvnKvSE1pwWWbWqvK64IjdZPPc0JLpUx2z1z2YP
+CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
+q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
+pTA8OOnOcAQgmsJXODtWzw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index c0e51158..aff31c4b 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -204,8 +204,10 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hof.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holmestrand.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
index efbecfdc..8b61b7a3 100644
--- a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
@@ -20,43 +20,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
@@ -98,43 +61,6 @@ mzisXEBrL04=
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
diff --git a/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..8498948c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ig.cas.cz/idp/shibboleth">
+ <md:Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-06T13:47:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider IG AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GFÚ AV ČR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ig.cas.cz/en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.ig.cas.czu</mdui:InformationURL>
+ <mdui:Logo height="44" width="30">https://jiftach.cas.cz/loga/logo-gfu-44.png</mdui:Logo>
+ <mdui:Logo height="146" width="100">https://jiftach.cas.cz/loga/logo-gfu-146.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
+NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvMAk1nwttucujjFQOSyuiS4jPK4M7TVip
+5rRgjz3M7Jmp4X0ZwYCcokPvD1iC+hQFHUiQdEGyvxPcl/3q7lKcrxFhbJUhP4yl
+ZgrJysS91zx9LxEgFeNRIObSGCDLe5+EKRBoyScHhBkBrbIMVhqTjwvIBPuzqmi0
+8sew/BijdVsP9JkGfTr15qw/U6rzE3kh6HY65P5x50D2gLl8dwyAkgdbTdrwZ+Z9
+il1x9sVlVasM+//2OFdhEtjqPAg0M2+azek3NxjYhnsM+ca22yLD5js8cMCVkheZ
+9KA94ic+4hd7NHqgUrmMETQEeOVUbZ5PndJI9lV+whxm5uWtEph9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pZy5jYXMuY3qGJGh0dHBzOi8vaWRwLmlnLmNhcy5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDghEtRanFH4cZQ/+Lclh2VR5bJYw
+DQYJKoZIhvcNAQEFBQADggEBAHwmYx8J6PauVsJg0DZs8d2qXv0vMJObff+rrEEV
+fOCRFu7xGfMNGFq8vIGk8iWeFE4XOk/uUntjuHCRmPiqeBifukhBWPXwwflpmimn
+lYW0fYbfDG5bqOa/fGv2ztq6cpKkWN81KI9bzXAuyYIgzYPXhodUXICa8OFYH2a/
+j91+yHDcBb/Kpl6ReAK4qj9GO0Z2k7dnNsbDtVCdi1DJpDWjElJszPl6dc1+5F6i
+ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
+iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ig.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
+NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvMAk1nwttucujjFQOSyuiS4jPK4M7TVip
+5rRgjz3M7Jmp4X0ZwYCcokPvD1iC+hQFHUiQdEGyvxPcl/3q7lKcrxFhbJUhP4yl
+ZgrJysS91zx9LxEgFeNRIObSGCDLe5+EKRBoyScHhBkBrbIMVhqTjwvIBPuzqmi0
+8sew/BijdVsP9JkGfTr15qw/U6rzE3kh6HY65P5x50D2gLl8dwyAkgdbTdrwZ+Z9
+il1x9sVlVasM+//2OFdhEtjqPAg0M2+azek3NxjYhnsM+ca22yLD5js8cMCVkheZ
+9KA94ic+4hd7NHqgUrmMETQEeOVUbZ5PndJI9lV+whxm5uWtEph9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pZy5jYXMuY3qGJGh0dHBzOi8vaWRwLmlnLmNhcy5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDghEtRanFH4cZQ/+Lclh2VR5bJYw
+DQYJKoZIhvcNAQEFBQADggEBAHwmYx8J6PauVsJg0DZs8d2qXv0vMJObff+rrEEV
+fOCRFu7xGfMNGFq8vIGk8iWeFE4XOk/uUntjuHCRmPiqeBifukhBWPXwwflpmimn
+lYW0fYbfDG5bqOa/fGv2ztq6cpKkWN81KI9bzXAuyYIgzYPXhodUXICa8OFYH2a/
+j91+yHDcBb/Kpl6ReAK4qj9GO0Z2k7dnNsbDtVCdi1DJpDWjElJszPl6dc1+5F6i
+ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
+iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institute of Geophysics of the CAS</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Geofyzikální ústav AV ČR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ig.cas.cz/en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.ig.cas.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Vaníček</md:SurName>
+ <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 7f2d11ef..00000000
--- a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lu.se/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
- <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Lunds universitet (Gammal)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Lund University (Old)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Gammal IDP - Använd inte!</mdui:Description>
- <mdui:Description xml:lang="en">Old IDP - do not use!</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
- <mdui:Logo xml:lang="sv" height="78" width="450">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
- <mdui:Logo xml:lang="en" height="78" width="382">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
- <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
- <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>lu.se</mdui:DomainHint>
- <mdui:DomainHint>lth.se</mdui:DomainHint>
- <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
- </mdui:DiscoHints>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
-MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
-f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
-9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
-QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
-o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
-ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
-ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
-JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
-CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
-g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
-jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
-u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lu.se/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
-MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
-f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
-9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
-QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
-o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
-ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
-ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
-JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
-CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
-g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
-jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
-u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="sv">Lunds universitet (Gammal)</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Lund University (Old)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
index 07474dd5..39cd1a8e 100644
--- a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
@@ -31,32 +31,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIULYVKeMBxRsucHrLPmp+zodQl8tkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owHhcNMTAwMzI2MjAxNDA1WhcN
-MTMwMzI2MjAxNDA1WjAZMRcwFQYDVQQDEw5pZHAubWVuZGVsdS5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn+h1Ko8RYR8t6wvUPDnV6KiDlU4UVb
-yY/oL58LnKDRNBq//7dNDtCX5dQh3iOQlH+FWXLUC4bdPXLNJAJw77u5VXl82yna
-OFPoENyUF8WJYETGumArObLC7AY45jT41oRba2V4aaJGYTQtFKbFAsSk0SEdG9gB
-vhEGcqIoC1S8b2lnlc4Vmpwq+2tE2IG4F+K3ddWMR1HsQ/x67G+exGEgk40vIu+e
-BHHAhxfo/hdp3e2fS7U01xk1+utNAJKe6g+mu1a8GRMfgNu6rsLuWP4EVmCbI3oD
-1c4/fZKKlxBvommYDnMQtLkV11aw2bLncMn/uCjnZcWyHdu8p65FmK0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1lbmRlbHUuY3qGJWh0dHBzOi8vaWRwLm1lbmRl
-bHUuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA5nyJD3Buj/4ij0SM4NErZG
-3GtGMA0GCSqGSIb3DQEBBQUAA4IBAQCyCILpxpUm1ZDUiR7QxchL4lA9S2x6XLQ0
-HWz41Op+1JtIgeqAFh6tAt1g7zdMa43VKgyIR25UGSiwHsr06z7FXJIZzoNjTjCM
-/zPKrBe0hO2RQc7AijF3+2QDrUJlHqZeJCtPLt3JWwtwlQTTIn90xMqXADFcUNFQ
-cRdzDuQSofQuHMEHcWgdtGRwQPacszBy91NpgX0T4y6xSfuQYNeTpmZXfnQL5smJ
-lBNL8eqOxByMpH+/YfQk98r7d7YmRqluNPP1GHwoqC2yg+UZ4HOwyi8S3qdnWiks
-cXNhujYx9zNwZVYZDpuixY0g3ar6KUpCoI47FH4JZyj1tEqbyKu4
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
@@ -98,32 +72,6 @@ eBFJcQNHXyofYwsQlK2LyCnlOlpQUtbXe5/BcXKA9pp+RnjZAB9dVpY/KJ6hy6BQ
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIULYVKeMBxRsucHrLPmp+zodQl8tkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owHhcNMTAwMzI2MjAxNDA1WhcN
-MTMwMzI2MjAxNDA1WjAZMRcwFQYDVQQDEw5pZHAubWVuZGVsdS5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn+h1Ko8RYR8t6wvUPDnV6KiDlU4UVb
-yY/oL58LnKDRNBq//7dNDtCX5dQh3iOQlH+FWXLUC4bdPXLNJAJw77u5VXl82yna
-OFPoENyUF8WJYETGumArObLC7AY45jT41oRba2V4aaJGYTQtFKbFAsSk0SEdG9gB
-vhEGcqIoC1S8b2lnlc4Vmpwq+2tE2IG4F+K3ddWMR1HsQ/x67G+exGEgk40vIu+e
-BHHAhxfo/hdp3e2fS7U01xk1+utNAJKe6g+mu1a8GRMfgNu6rsLuWP4EVmCbI3oD
-1c4/fZKKlxBvommYDnMQtLkV11aw2bLncMn/uCjnZcWyHdu8p65FmK0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1lbmRlbHUuY3qGJWh0dHBzOi8vaWRwLm1lbmRl
-bHUuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA5nyJD3Buj/4ij0SM4NErZG
-3GtGMA0GCSqGSIb3DQEBBQUAA4IBAQCyCILpxpUm1ZDUiR7QxchL4lA9S2x6XLQ0
-HWz41Op+1JtIgeqAFh6tAt1g7zdMa43VKgyIR25UGSiwHsr06z7FXJIZzoNjTjCM
-/zPKrBe0hO2RQc7AijF3+2QDrUJlHqZeJCtPLt3JWwtwlQTTIn90xMqXADFcUNFQ
-cRdzDuQSofQuHMEHcWgdtGRwQPacszBy91NpgX0T4y6xSfuQYNeTpmZXfnQL5smJ
-lBNL8eqOxByMpH+/YfQk98r7d7YmRqluNPP1GHwoqC2yg+UZ4HOwyi8S3qdnWiks
-cXNhujYx9zNwZVYZDpuixY0g3ar6KUpCoI47FH4JZyj1tEqbyKu4
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
diff --git a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index d012e423..00000000
--- a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mijnhelicon.nl/nidp/saml2/metadata">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-05T17:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="nl">Helicon Opleidingen</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Helicon Opleidingen</mdui:DisplayName>
- <mdui:Description xml:lang="nl">Helicon Opleidingen</mdui:Description>
- <mdui:Description xml:lang="en">Helicon Opleidingen</mdui:Description>
- <mdui:Logo height="41" width="108">https://static.surfconext.nl/logos/idp/helicon.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Helicon Opleidingen MBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Helicon Opleidingen MBO</mdui:Keywords>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9ab8d5ff3391fff206e4c5c9b138c9d6"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Helicon Opleidingen</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Helicon</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.helicon.nl</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
index 3fce7dfb..26a8d67b 100644
--- a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
@@ -45,38 +45,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
- Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
- 8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
- nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
- vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
- 8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
- MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
- nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
- w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
- MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
- ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
- YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
- mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -123,38 +91,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
- Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
- 8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
- nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
- vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
- 8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
- MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
- nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
- w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
- MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
- ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
- YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
- mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
index 19329003..5e9b1cf1 100644
--- a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
@@ -62,7 +62,7 @@ mSq9+fohezZUYgCirIJuORsZiubp0lExD9/P9hYK6tNtxCeKpOrFKfqDonlcFwq4
<md:Organization>
<md:OrganizationName xml:lang="en">Maynooth University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Maynooth University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://mu.ie</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.maynoothuniversity.ie</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Jason</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..12c8aca3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pasteur.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-06T15:53:01Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pasteur.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institut Pasteur</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAxZJREFUOBFNU0toVEkUvbfqvf69MSZqT4vjh8nCvzCMoMysXEhAgpKFUSHJ+KENuFB36kobXQjD4IyCC02Q2Om40I0rQZAZRUEFFxpFiYtEEn8d2yZmjN39XtW93uo2YMGjbtU799xzP4Xw/eq8quHaDlu/6szFFgbLFkXWJJFpSmNyulhNVGHNc4ZcjmbdkHOgAHKAuRMMgJzp6fvZMhxAwDZEXsIMTQIuM+J5o/W5qYG9UwCMDQKcNRrH+V39uxXS3+inWoAiuURgG30SdCcRGUB1WCEOTBay1xseQjuRX7xx3tzXE0FhYMtPAfSHJOrI1r1ReR6B7Srls1cWdPc/0EHLRpopl0BhG0E0+TF/4A2+H/JtlaJy+39nm0fNPK+FK1HEqFD7WqK/+FCbuy6T+Dif2BuWqBlAUcXULSmuFsg/SnvRkeHS1sAwjKGtjbOX8AWo60DAEVdUy0rLHUsKsqEIgJIYm4yxf6j0zhv5bfc7Xo1MN29vD2+2RmF4Qn7+j7GUbI2FXkycMUI/ITQ0huS/FWOtlHCX+nXP+PrWlLcqkwwv/5toW14ayp6UQv1OX6YeOLGOgk3ozDSYEJTiXqvsZowF0h1eqd5ZnfpMFljHflEMD9NdFw8WB7PPPhT2/0bKHHQExLUZAR9DNq1kVIjMpzmquF8/KIOq4sKwDV2b5qAfP5fu6XskVc8mIFV1qPLQoemQTN4CdoDim6B0XBQ5eaEShhFp2ydx9oSF2NRIzPU6MacvpOiCI8j05ANf+3d1LDgjRUwI3kiXUBryVBWv7BuV+PekUAJFGQJUbE3ExgVnN4UQuUlmSFJdNjdGXRojCgquL64/f0lkZ3ryOYAMX31a62AVD1yW5tu1kWAeR9WXRMlLSh6GKhX235aMjmMsCZKf67mScgse42LPLs9pRhWLkwlDRu4tD3VPOwLHDkJyCqLqUcmvKMcKhxV5WvB41lv2LzKZlm3tiVbcXhrsvQM5dmFcKg29k4PZP2U811nWG1jxinSt6ZgjKC2dmEFNHWRp7Y+15g3FfO8tpxxySF8BHZ54NL0wTpgAAAAASUVORK5CYII=</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.pasteur.fr/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Institut Pasteur's staff</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Institut Pasteur</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Personnel de l'Institut Pasteur</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDJDCCAgygAwIBAgIVAM8NHj+g2+LDA3cgW3pLZnacQa9QMA0GCSqGSIb3DQEB BQUAMBkxFzAVBgNVBAMTDmlkcC5wYXN0ZXVyLmZyMB4XDTEzMTAxNTEwMzQzN1oX DTMzMTAxNTEwMzQzN1owGTEXMBUGA1UEAxMOaWRwLnBhc3RldXIuZnIwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvDkYEJsGc0q44FM+vk1gvd2olN2Oa QS5MEJrvSsgNaL6b8bzgPhqOCfAeSLc9mVmp+j7MuFWQEboy0OAmsFzSD3YVBipJ AMa8+bwk5jhvB3BJ/YbsjSYdx3nP/W3um9kjx0L44bfrsFltA8ShGx3TzgFkYk5D U8yynYz0azOBTrswm+OMKNbFf6kg3ApWsIX0EsYwtzKrbF/NKlCiUovdj9/ZEZU3 Ofk07Q0Ugi21HusAM9wWBhVmeuOnnIxR+4lWLwocfUBFDsSyyD9mjxqXMqU24N7R vs/mSIYGZe18H8zS26YS0IMVzlPVZSIF8j9XMFLTvprk28SYXnc0cxmlAgMBAAGj YzBhMEAGA1UdEQQ5MDeCDmlkcC5wYXN0ZXVyLmZyhiVodHRwczovL2lkcC5wYXN0 ZXVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRgZUBj6mFNK1rhpOxmhCa5 42xG9TANBgkqhkiG9w0BAQUFAAOCAQEAo3GFGV2Y3sb2QENh8ZJI+4hG2Pg4Adoj umDi7S6mXttNFcoC3LPVQuC/nsZsSz0ssmgHNFyvXOpLvITrUftdtS+zmCFwGlBV nWXF0sk2inc2xJRwYz6WolTj8I8J4Y2XvRMKu53Ysg4JPioE2nNtJs5PVsbkLpVU sF9M03mahyLDFNydv7ZTesTkN9r5+3WjZJVSQw5O8qAKllCo4t7+LS4JIl7Vg7a0 j3JcaueG6lbWSn82ib/oZcGGC8TpM4BrD+hrRuMrsHv0vuoFuzOlLjZVD89XuuLO GE+WCIfpIz0LEDbzBnZwm6z24itrreAnY1PWyGfl0Pj8fPDxoyaZNw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SLO"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institut Pasteur</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institut Pasteur</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.pasteur.fr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>fed-admin@pasteur.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml
new file mode 100644
index 00000000..642c69a5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.politecnica.edu.co/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2016-04-04T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="es">http://colfire.co/?page_id=55</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politecnica.edu.co</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">POLITECNICA - Corporacion Politecnica Nacional de Colombia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">POLITECNICA - Corporación Politécnica Nacional de Colombia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Corporacion Politecnica Nacional de Colombia</mdui:Description>
+ <mdui:Description xml:lang="es">Corporación Politécnica Nacional de Colombia</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVALLT+WTdNsEz6xx5u57WIcx8JElFMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmljYS5lZHUuY28wHhcNMTYwMjI1
+MTQ0NzI4WhcNMzYwMjI1MTQ0NzI4WjAhMR8wHQYDVQQDDBZpZHAucG9saXRlY25p
+Y2EuZWR1LmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjKyNQzEY
+IDz7LLU7JhEYAguZiscGEX3B79BN5iaaEEd7NhzyYL5e4H4sFnJZ0i3lvFxGlDZj
+XtT7xEv8eS6SSbjZJ9FOmmbOMHfpGMIaYjXHx6MzkLN/jfVv/Q18JXCnQzmaY8XS
+YzQXxl5bGtBcsnv6g0TmJZpxS5y/jNIQvcZRujekkbskjyMkqlLo7fA41BjwGjgr
+Ri44+/QUaGgAQzLsjyPJzC+MDfcCQWG1L9Jdw8853qboTkn5SHJqrZD1OeOTYirw
+WsQRj249Y33p7+kLBrMD+54KrPk63mLPF2lYjh2KzfBR1qbuiNjAEXXKfYAl47dz
+I/KNCNpiLVbYXwIDAQABo3MwcTAdBgNVHQ4EFgQUM43hzLJFdMk8Sxshi8WWy7ME
+JaIwUAYDVR0RBEkwR4IWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jb4YtaHR0cHM6Ly9p
+ZHAucG9saXRlY25pY2EuZWR1LmNvL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBOazTBGiBWAlaDmIhRxZgTmYDQeqvia95RR59uW8bhg1HSxQruz45d
+ZF4XWEhJ6utKGo6QCJSXf/MsAaPUKCYT6OBvIbTArTeUeKzyOEAnH3IL3uO4F3d6
+GyQc7EOSaAWywtPe1fiCM02I//FNl1K+VIJdfO7lFGLNx8XZ4TAmxWmlCc3uaI23
+v/2bRIY12legoOZGMBD+U05hMvPozP3dawqRXKmMpIT94t7QoRUT9sLfCE1E/Obn
+s0fmhhFblLDWEWCf46oIfgd4zGZqcmLHAKeUmnCA2tMrSD7+fmXVDz6yt3ySpKCK
+TdJDiBfKuVh3IECFWZ6+L9/CVJv5Sqm7
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUNo4WuHVgmvnokxrB1OeB+1nrgn8wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjRaFw0zNjAyMjUxNDQ3MjRaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCliUrMbHvs
+kl3COdt7P0UgoEQ5smBH9YetLsvzGo+tbLJ7SRqkITlRWQXaJFqePJ+APRo8tRIR
+mL99gl2OuOc6etN82KVB8idyE2rC/uEQnqfVZO0WPAibICEm2zjoaMMdSTgev4gI
+LqeZ2HCG50DjFhcWNglsTABhvHDk8XE/QPpqoFALepozKykcTVidHzyDQeH4+syJ
+IiwsW+mH83LnbQ1vIuqqGYwZ9+9BDy0pA3D9KWePfkcTpoVJLEMYHurgTEYSqivB
+476LFkaTd7DhlLi+ddb09OPeyqsumq/C0kGMY1GTJckk0C7hOayGwiWoZkyTUSHF
+ZllwhARpj8pHAgMBAAGjczBxMB0GA1UdDgQWBBRY/2odAVt3NTy+R/k2pou6SW/r
+2DBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGbF/LoU7ZuCZoNjUyxKdfxjkJkgZ75PiQlqQ21+L5RbYbsTiMzuJtaV
+qyNJPJvT0MsXRwnKntiSChZ6nVtdLQXcXf2xWCiJHdcb0uzhGTFr3aIiPOTY9TiJ
+aw1foI6WxTVPtolIj+BmeKi+1Vy+ITyJZYXqC3ZnSNGv5jxGLyyjI9WnwJ5Zonl5
+MG63FxrmNlorkaHh8K6TOWcdIw2IeqBr15f7oExN6pgijgyJ/9oeVk01K9d55NLI
+lfQnX3dTZbzhAPoGnAlCIUcJjeH+ESDAR57hVC8u8+kMjdKorq4Ohvpqc+XjAYRl
+e29cUKcPujSEW+pJdMWH+2sPqW2M3wU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUMgiMuAX0pbhavZ4i1yl7uO2HpAEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjZaFw0zNjAyMjUxNDQ3MjZaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjhzloyYYi
+oKmFqjuyzjiU0FdkR9kZx5t4kHbjnwbLfSr+umiRQOQuz1oVkJwXIkjKobMXUY5F
+SnPQlzUZyw2KxMmH4Pg+4KfEhYj0biRG/bmWkvoTqJdrYq9273j7uFT18i5SEWzX
+jmG8imWFkmvK2Y6VrOEYuIRiDil27TPxvEZJ6dSHv2Q/FOIzfYD582bBmeWGcOmY
+JpMuqzi5FW1vs96QIabJ9QKJ8VTvVv6TXaj75FvvWbDbtOUWghP9IKFVSa6mPB9V
+z9lHdCOPAfzsbm82hG67Q5ipEmbIfBt5bHIRrTViWwC3cYUuJudQ4Zb6Cz40hO9u
+lCIIAvDQeDCtAgMBAAGjczBxMB0GA1UdDgQWBBSZST+CVKY+u0y9KuR6jRFg1MKk
+hDBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAFJXD1U/w5DldguWWlpIgaGX33gpB8lmZ5DmwCAV9TCo5MtkzRd3psZf
+SW/FXvDqARzIPFiHgIr5uUagWQDTmTr9+AmRgMl12sHC6jL391TMw9k2B+ofA6pY
+iWCooMb2Ua8sHfETlb1i7/oHMoKfAI+vOHN30B/3zhGuevobaLmjKPBSvfCvYRJq
+nq5OpQh1pJdNwnfOFsxD5hFctOan+Q8PQCiMhm7z2epJAoIVwpxQVYzLhhQVq7NJ
+DKxk60nmPyjgvFYuXNh9JEv0Cwe8rVzuBxssCDuJYtIKNRynILzaYFP5a3lp0/tC
+hnIvrkPFl+JtdYNgaSsOrzFBzAGRH4I=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.politecnica.edu.co/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politecnica.edu.co</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVALLT+WTdNsEz6xx5u57WIcx8JElFMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmljYS5lZHUuY28wHhcNMTYwMjI1
+MTQ0NzI4WhcNMzYwMjI1MTQ0NzI4WjAhMR8wHQYDVQQDDBZpZHAucG9saXRlY25p
+Y2EuZWR1LmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjKyNQzEY
+IDz7LLU7JhEYAguZiscGEX3B79BN5iaaEEd7NhzyYL5e4H4sFnJZ0i3lvFxGlDZj
+XtT7xEv8eS6SSbjZJ9FOmmbOMHfpGMIaYjXHx6MzkLN/jfVv/Q18JXCnQzmaY8XS
+YzQXxl5bGtBcsnv6g0TmJZpxS5y/jNIQvcZRujekkbskjyMkqlLo7fA41BjwGjgr
+Ri44+/QUaGgAQzLsjyPJzC+MDfcCQWG1L9Jdw8853qboTkn5SHJqrZD1OeOTYirw
+WsQRj249Y33p7+kLBrMD+54KrPk63mLPF2lYjh2KzfBR1qbuiNjAEXXKfYAl47dz
+I/KNCNpiLVbYXwIDAQABo3MwcTAdBgNVHQ4EFgQUM43hzLJFdMk8Sxshi8WWy7ME
+JaIwUAYDVR0RBEkwR4IWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jb4YtaHR0cHM6Ly9p
+ZHAucG9saXRlY25pY2EuZWR1LmNvL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBOazTBGiBWAlaDmIhRxZgTmYDQeqvia95RR59uW8bhg1HSxQruz45d
+ZF4XWEhJ6utKGo6QCJSXf/MsAaPUKCYT6OBvIbTArTeUeKzyOEAnH3IL3uO4F3d6
+GyQc7EOSaAWywtPe1fiCM02I//FNl1K+VIJdfO7lFGLNx8XZ4TAmxWmlCc3uaI23
+v/2bRIY12legoOZGMBD+U05hMvPozP3dawqRXKmMpIT94t7QoRUT9sLfCE1E/Obn
+s0fmhhFblLDWEWCf46oIfgd4zGZqcmLHAKeUmnCA2tMrSD7+fmXVDz6yt3ySpKCK
+TdJDiBfKuVh3IECFWZ6+L9/CVJv5Sqm7
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUNo4WuHVgmvnokxrB1OeB+1nrgn8wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjRaFw0zNjAyMjUxNDQ3MjRaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCliUrMbHvs
+kl3COdt7P0UgoEQ5smBH9YetLsvzGo+tbLJ7SRqkITlRWQXaJFqePJ+APRo8tRIR
+mL99gl2OuOc6etN82KVB8idyE2rC/uEQnqfVZO0WPAibICEm2zjoaMMdSTgev4gI
+LqeZ2HCG50DjFhcWNglsTABhvHDk8XE/QPpqoFALepozKykcTVidHzyDQeH4+syJ
+IiwsW+mH83LnbQ1vIuqqGYwZ9+9BDy0pA3D9KWePfkcTpoVJLEMYHurgTEYSqivB
+476LFkaTd7DhlLi+ddb09OPeyqsumq/C0kGMY1GTJckk0C7hOayGwiWoZkyTUSHF
+ZllwhARpj8pHAgMBAAGjczBxMB0GA1UdDgQWBBRY/2odAVt3NTy+R/k2pou6SW/r
+2DBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGbF/LoU7ZuCZoNjUyxKdfxjkJkgZ75PiQlqQ21+L5RbYbsTiMzuJtaV
+qyNJPJvT0MsXRwnKntiSChZ6nVtdLQXcXf2xWCiJHdcb0uzhGTFr3aIiPOTY9TiJ
+aw1foI6WxTVPtolIj+BmeKi+1Vy+ITyJZYXqC3ZnSNGv5jxGLyyjI9WnwJ5Zonl5
+MG63FxrmNlorkaHh8K6TOWcdIw2IeqBr15f7oExN6pgijgyJ/9oeVk01K9d55NLI
+lfQnX3dTZbzhAPoGnAlCIUcJjeH+ESDAR57hVC8u8+kMjdKorq4Ohvpqc+XjAYRl
+e29cUKcPujSEW+pJdMWH+2sPqW2M3wU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUMgiMuAX0pbhavZ4i1yl7uO2HpAEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjZaFw0zNjAyMjUxNDQ3MjZaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjhzloyYYi
+oKmFqjuyzjiU0FdkR9kZx5t4kHbjnwbLfSr+umiRQOQuz1oVkJwXIkjKobMXUY5F
+SnPQlzUZyw2KxMmH4Pg+4KfEhYj0biRG/bmWkvoTqJdrYq9273j7uFT18i5SEWzX
+jmG8imWFkmvK2Y6VrOEYuIRiDil27TPxvEZJ6dSHv2Q/FOIzfYD582bBmeWGcOmY
+JpMuqzi5FW1vs96QIabJ9QKJ8VTvVv6TXaj75FvvWbDbtOUWghP9IKFVSa6mPB9V
+z9lHdCOPAfzsbm82hG67Q5ipEmbIfBt5bHIRrTViWwC3cYUuJudQ4Zb6Cz40hO9u
+lCIIAvDQeDCtAgMBAAGjczBxMB0GA1UdDgQWBBSZST+CVKY+u0y9KuR6jRFg1MKk
+hDBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAFJXD1U/w5DldguWWlpIgaGX33gpB8lmZ5DmwCAV9TCo5MtkzRd3psZf
+SW/FXvDqARzIPFiHgIr5uUagWQDTmTr9+AmRgMl12sHC6jL391TMw9k2B+ofA6pY
+iWCooMb2Ua8sHfETlb1i7/oHMoKfAI+vOHN30B/3zhGuevobaLmjKPBSvfCvYRJq
+nq5OpQh1pJdNwnfOFsxD5hFctOan+Q8PQCiMhm7z2epJAoIVwpxQVYzLhhQVq7NJ
+DKxk60nmPyjgvFYuXNh9JEv0Cwe8rVzuBxssCDuJYtIKNRynILzaYFP5a3lp0/tC
+hnIvrkPFl+JtdYNgaSsOrzFBzAGRH4I=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="es">POLITECNICA - Corporación Politécnica Nacional de Colombia</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">POLITECNICA - Corporación Politécnica Nacional de Colombia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="es">POLITECNICA - Corporación Politécnica Nacional de Colombia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">POLITECNICA - Corporacion Politecnica Nacional de Colombia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="es">http://www.politecnica.edu.co</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.politecnica.edu.co</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>Hernan Hidalgo Vallejo</md:SurName>
+ <md:EmailAddress>hhidalgo@politecnica.edu.co</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Hernan Hidalgo Vallejo</md:SurName>
+ <md:EmailAddress>hhidalgo@politecnica.edu.co</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
index db02d03f..c5c594d1 100644
--- a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
@@ -44,6 +44,32 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
+ BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
+ NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs3FzkF00xjUKGi7Fdh32
+ ZB2ijup6n53CeVQF5fxDuuesM+LgSLKu29/mM3/cbtOVxWmcyK+MVWIEMubbqNfa
+ 6lhmHCSgpJe3H9LkpvKW1oH+4ABZ2dXw4ngzwaK2apTQaAaTyIF6nxDNqbwVhvut
+ ELaou4dHslzvHSmk/sEvqSjWBWnfZFYe1nC7ssNIJj3i5HBK9S5JWpHX5LW7916x
+ 4hPaqWZQp849Zav98Wd9z4fh37AuROjDSzxkJSyTd5ohAypFaAyzwzHd4pF1/yyA
+ IJkW60VRf2SM8+4+emTwuXRamJkn4sDDNo292u7rXQKfPXUdP0Okt979bnIuhjIx
+ mwIDAQABo2swaTAdBgNVHQ4EFgQUuthtEWH554XjUaTMZx8diEY+i/4wSAYDVR0R
+ BEEwP4ISaWRwLnJpY2h1aXNoLmFjLnVrhilodHRwczovL2lkcC5yaWNodWlzaC5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAfO9POrniizxA
+ 3V4bb14SNEIuoKLkG4yzHXOlYP1rExHcdZXkzNXG83C50sNglLR7TadbZlk441b+
+ rKjys6rravpMIb4VnerHNHMcG8B7q/DY7BZQ1TzCI1/yqH9pJCo3ywj79/teJ+qt
+ mWBp0cRq9tkOSrAKNJG4m00JZTyk9lUssAPfsNqzPzWy4jDW+DbhoORAx7Xazsyb
+ R51QO8W37mcTYc3m9+CT9q9Dsmsi/gBdsn9UNzKGN+5++ly7Iu/rECW0htfAu3D3
+ Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
+ RHU9aHXUNA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -89,6 +115,32 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
+ BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
+ NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs3FzkF00xjUKGi7Fdh32
+ ZB2ijup6n53CeVQF5fxDuuesM+LgSLKu29/mM3/cbtOVxWmcyK+MVWIEMubbqNfa
+ 6lhmHCSgpJe3H9LkpvKW1oH+4ABZ2dXw4ngzwaK2apTQaAaTyIF6nxDNqbwVhvut
+ ELaou4dHslzvHSmk/sEvqSjWBWnfZFYe1nC7ssNIJj3i5HBK9S5JWpHX5LW7916x
+ 4hPaqWZQp849Zav98Wd9z4fh37AuROjDSzxkJSyTd5ohAypFaAyzwzHd4pF1/yyA
+ IJkW60VRf2SM8+4+emTwuXRamJkn4sDDNo292u7rXQKfPXUdP0Okt979bnIuhjIx
+ mwIDAQABo2swaTAdBgNVHQ4EFgQUuthtEWH554XjUaTMZx8diEY+i/4wSAYDVR0R
+ BEEwP4ISaWRwLnJpY2h1aXNoLmFjLnVrhilodHRwczovL2lkcC5yaWNodWlzaC5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAfO9POrniizxA
+ 3V4bb14SNEIuoKLkG4yzHXOlYP1rExHcdZXkzNXG83C50sNglLR7TadbZlk441b+
+ rKjys6rravpMIb4VnerHNHMcG8B7q/DY7BZQ1TzCI1/yqH9pJCo3ywj79/teJ+qt
+ mWBp0cRq9tkOSrAKNJG4m00JZTyk9lUssAPfsNqzPzWy4jDW+DbhoORAx7Xazsyb
+ R51QO8W37mcTYc3m9+CT9q9Dsmsi/gBdsn9UNzKGN+5++ly7Iu/rECW0htfAu3D3
+ Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
+ RHU9aHXUNA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml b/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
deleted file mode 100644
index bb8d7115..00000000
--- a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sfpkr.si/idp/20141210">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-12T10:12:07Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfpkr.si</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.sfpkr.si</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Elementary school France Preseren Kranj</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sl">Osnovna šola Franceta Prešerna Kranj</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity provider for elementary schoole France Preseren Kranj</mdui:Description>
- <mdui:Description xml:lang="sl">Ponudnik identitet osnovne sole Franceta Prešerna Kranj</mdui:Description>
- <mdui:Keywords xml:lang="en">identity provider elementary schoole France Preseren Kranj idp identity</mdui:Keywords>
- <mdui:Keywords xml:lang="sl">ponudnik identitet osnovna sola Franceta Preserna Kranj idp identiteta</mdui:Keywords>
- <mdui:Logo height="111" width="111">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAHpNJREFUeF7tXSt0FNsS5bkrr7z2SiQSi0QisUgkEotEIrEx963IyNjIyEgsMhI5r/auqtPnU+fTk0kmvPdYaxbJTKen+9SpXbu+/a9//vn34cX///2eK3C4uzz8lq8fct0/r/i6fffxcPHi9eH+6tvhgPftdX/57XD38dPh180F38PveP2W9xvI6YXeiNxc+vCZ/wzByLVCID++fD78/P71cPfp8+H7i5f8H8KEgK5evaNAL168ogCv33yQY14drl+/j+/Vzvs7rYcJ7zcRILRHtOvq5bvD5Ys3FAwEeH/1XYX04dNBfqFAb95+sGNeHy7/fHO4kheOuX3/UTUTm9W1FD/fyqbFK733zDexXPPz17yfBo+24Ndv3lMI0CoI5RcWXG7kUn6/hfAMSn98+0pNu5Hjf91eiubp3/28+LoJSP4WwrwWLaWA/3p7uHn3YRPiM0clEd4z3mGyuIBCwJ7DOhb6RiDw7tMnaiBtGTXvNbWQwpN7wmcQ1v3l98NPgVF8niBTjvklf3P191vCLd7/8fXL4cK08xrnFYGXtvH5rdPzhU0Ritqpl2mBIShoxt3nz0ljICzApBKW7yK8S9EuCEvsmwganwNCoYUQEARyf62Cc3uoUKsCxntJ+4aad35T8zxhU4REgfyhUOhaBKEdfqhmQVsUNlWgSatMwBTWty+E1cu/1N5BYNgQeFG4Rl5+CsReyndd/vFGBZzbwq4Az6+Jzww2bUEgANGWC7FB1CzTJCy+Ew0sPO0eNEgWni4A7KMsNmCWECqCBmRCKFd/vzvc8n2BR9pMecn5L+WFn7ER9BzYHLlWdYT0DIjN84HNardfvxabJYtOQiJCuIKmibD090tqJCA1QV9O9XkuE4IcTziFQOBGyM8gLzfiG95wAyj5uRXtpZ9Y+FOV4LLvAPGB3Tyni3V+2AREimYByn6JLXIar5pldurXNe0cFvlgDjeESA1zmGuc2Gzh06KbK4Bjxc5BC7EhoJnQQIXRXGCmgb4ZyGwvZA8oQcqh+hxCPL/m3YtghDlCi8gesXgZCdH3RNOEdSbYdEEB4kLnOoK6WijGJkUg1GZzOZIQXGDyPzYVNBMCxgsQnGxm8XdPawfPqnmIksDO3Iiv5XaIu9kg1IkK/C862PDjci0KIa63gE79/fOOMM1hxzXdfRCHXn7Hz9hcN2/NpSArlRdIzp/iGwoMl8J/GiGej7AYK6TQBLZAJhKlF7KBeCVsEhaGNgmREY+KNKG8AOqmx3SovlwXHPwLIIERJBcew2+4brkmXA82H1gxjm/h9vFdifPApkdLzK7B7sDuAb7U/3pNv+xW4JTsz+xcnwVG7DDSrJ7WZe/D6Zdr+Q6bJowX10TmC2de/vcIDmxm+rlBg5H2n04rz6N5ZmNA87EgEBYCyWCIgFF3lkEouECFXVvd0TOYHMAntE+IEGwbXAi6GojCiN/IQLigBCD8h5ColMkYEaZHCrM9keZt/huoOuwEFgfOMcmI2xRAowgLi4MFo99Fwc00pifQHpwuvO8bRrQe8HgnUI7r9o2lNk+cf3nB7VgLM65uvDXtfCLCsmlBipYAEsUFAPwAmhDKos/GtI5F+cNcYyTIFZhaEFijIeobqpui/iCQApvK/U2gg5IZgdRlhDiNEJ8WNmUHa+xQNQwQdCuMjqzT0jqEz4KYjNjhClHJA8wzDa4/V7cFSEABIeNgWQsGxK+x6dQf7eYJI79xFAjYkVd9XNj0qEn2PxYAcUQPb6l/J2EvOOsiTLzaHbxqv1bgcwWSyvMQGRDhEYj02KgihRIroAmjOMH9xq7NHvToX+/jwaY5t7BrFAhICsJTabeKAOWmyeRkUQiXYHCN0/0YmrcKW1uEBQKEnYazDsExNSU/027jmnHtcPjhPkjoDHCKl2Y65LNQo+pNuXpduiaPA5sW8sJOVQMvbFKYJdjZL8YY5WVEADcNGKUft3yTI7g8lfYFroZDJv4nY9a6GAgJ8K9BbnPgmcqSgDc3ptTR1BGckIStoMJ2zIlhU0/86waMUtMwjBtSiK8UYkSIjGEiz4YAMcoV5FjcoCdS210aLOSum8/tXvTzCuHZtAQEhqEygX+/L2Y4AKtiA+nEw5WAAy/ayoQvojBd7Vu13eV1nhg25QZThOI1NQo7DlCJKIVSbRMgShDkc9wY/D064l1D3nMXOoueZxVcyNB2vF/EMmc7vf0csIiwmKaR3hIxIExWqDnRwve4lporBKE28dMhmZld28lgM7NLYGdIoEIghQEXl0Bu8Paj0m4QAAiWkZUwgrLq35lQkAKyfJ5+j1SMyYLxJbse1wQtx3WlLAKIhpRJ+N+1lWORTdIIDKvTRNPU5qm7w/vwe8n90+Xg+T4beCLYzBYadZSC/4hOpJya+0+mEcgQaH1JnvwcGeuNOHBD5AlTLJpoNpxoQBXioZ5gdd+s/V8gzkoeIEwKEMJfXWRqsJRpGONU+NxeqLFpiUp9fzNBzcnLiWFTdh5gUxaSBUFfZVeaNuSpFpAWZAqSQ76UudaiIScHWCCwVQ9f5ZEP5uiqF21S9tLfzS6LzYXgt4jOxDUxQqbwKWRMNszt+0+027gnuBPYQJvbE0HgPjsb2csTsk27YTqvkqzEjQFWBGK2+ORmFwA7G8Mc2DtzOWgzE3u1MgYTRi4Y/3kTjgpJBafs138v/04jKFonE2lJ67KAjLBkUIQHu477xgbwgij6r8suwn6WfALYDPywPKQkQsRudIYJ1wA3CsEy8BxC1bYRWL/idSYGTS4Ihb5No2KBOUTWx/nvLlA7l3xXSev7pAhw7ZXZfi0bAshmEMH2idgezYsFewLY7GMznFi/GTIzgSbCCo29FA1lZQ/NDoUGi+CcocaCyrQILkkjSNX+QtjZ7zWUuh2ETe77nBt6wBl3Nwj/w0UAEQPLJkHyAt6jsgpzhn1C2Kygz5imp1bUH9IaTNameLonsncWKnOY7C1+LdAxLEaap4J1Afv/sMd5PU23f4GQrqEz2niPtlRV3vvqW1aIjR5zAs2bGGNjhp4Hw4704tceNUctJkv64EsFdq0vtBoiKxtXa2GgqX5u1s50oyKZo++bVGxlEt4wt7cKl4E5qjT4RJq3cEG545oYaPB3chyi+Il4dGEvJyCZVnVgMSI1PRKj0ZIa1uvFrJBmmjSeU/+95OYEhGXkr4zCWnmYqjxOc34tzK0KoNTMvvb13Qeh/0W/wmr4am6nuhAc5RInIcBHgs1IMAu+DkgKMu2oykpMsk84Wvh09rmRl/EmKG3eBtGSFKZNHt3H7H5G7sbEj2zCZvG5TqR5sxtZgFWLC8I25kIp/bY56Sj+toHQaiMUjvvmMsDBBhEZa8mxMNizZSt+XnnME2peBCnVjaDDR6IyHmrKnevIPm3sMrZ5NdmJN0Lp56UAcuF/PlRQkWnpQewuttnTir3v74WCwI5IfNFDa72Fj9lnpjUVO93j50G4qeg3tEGPIcQVVIqPOS1sDnfrgjFnXBRdPLHNiyIoJenIhdjavVbzApuHqIi4KuOc4sqCz2ze6jn6WnsaV0HSIAgSrwdiOzvYcoHrNq+OWZZ+3ibYknHGsc3tb5eaV5ZzcQ/V1j7TPYnmIRaIhUIqKAwr5Xm9UajIIysTprlBYRnbzKMlUfxzrnk2dKC4jxlxeagbMdPQoeat7oyBmltJH3vHUYhTCYhVYRI6upf/vd6xzJrbNVi4qdaMnn9XZAh6sc0si1ATnMjPY0OLpHfakoyRPzsTwMjfXYHPrs3bS0yC49E6jG4ZFJ6ywMgFqDcMEuAxzaJ1OCIFOJf1Kwxjmias2ObFLkEv61BrMn28ZL9nmpfbx1XSNtLWXWzzBJoH55rtw1olxmIiLwcQTUSODPk4JiktAfqzaYrcbkgLWfupnDYbULLN8G8rzWyyFGkz1K1kEXmR90bCzQpzW4TpnK9rToY271jNq3YkaH7y0aSoyPrWkAYiVEoTpSc5OSQANS4p8FteYCovyBOnYVC5dhFqYlLGP2PNq/J5+E70p6d0Va15+jtYsc9tQTIWZR8owfB6GZiQO2xQbOI8wO32vyA8M02MYfkBhCXQWDjZYte8BNwbJqmNPgMMM1Dk5rFAcXW0l5C3mtfP6QXEZSEb0dNgvM+S/Mb1Ma2xUg/WZf4px7LTSTPxdeqLSIMKcWHj6LNnX19TiDtzo4Z+3rHaF+yILAXE0gWDSZb4yc9e0whBlMLLYbMKTDukVf/X+buSbbalD7NMRU2M1PbBfgd2D5MmRLM4LkQ2ozeB3ljC2eedURut0szXAsJkIW5RNTeKuJxc83qqbu9Dw0hkpLhHhIid7INruGNFeG0LlxEca94YugRFXDLPmG9a2LLUONveC3BzGkWT7c8E6RVnKOMXQUADWbOD7id5wV9MJM56EvE5zAaurcwZTtYzqIU5QWyzw47gs9kMFNqPpJEy+YGD32wsR35RcBVkEVgRFtSmRJqVC3iWiehqXmhbbWJgKkjqaIaVa7CC7ONH2kIgivfbE4K9lN/tnQgWdaU6qRBuyYyldjXvhJBZ2whUS2MnJiMtFyHsE+3KPjesYGNZ4VIoqE7muxVarH0jm9ljn6zmLsJl1UIb03Z753Ye52OBr/UvFFn2rG0MAq9dq7X27TT1b6+70Aoc8EIblsrLxVZ4iQC7ZbzLVWo2ZZdyvGJePOu5PPY4RDWWbeleaPMqpzzfBKlWJXTc2zgnr6OAzph54j49+0+bh85eYduOHtoGlpcB+rxQ0VKfQtitXe2TmSNhsxI2IJJN+NpYAiONUBnxXz7jxCFvxrfftWZzY28cJlBk0Ps1lv0kbC+2mbPRcaK2yFqgPBGFwwWiRNESFQauP2/AZDm/DXO9h5Bqu1WUThxl8x4Cm5kQQZ/FPtBNEDYFQbKpRG4I/hB9J2gfiIxQ5dTXhhsSWNJ5mKXGtemfNsCcB5+X2eZI8wh3EmRf7aEw2MQwVq92Qy0nbBlDgqnp0qNOHe09XvP2wmZsQL0ymg34GKsIhpl61iRy4b5TbgMtk1CngWbpnz609rVv1ebhmuPW6g45s85ZH0CHa/NwoENvW0o/WvM1t+EI2BxEAyAUQAGC0zYsgENnbN4lmkHK5hM9Xu3FrMyvtklrv+d2sdwQccFua+dqJhgsLLRPbD4bKW1sMocCoZ/CmlEIp01IrSfAFQhl3eZe2IxuBtCHgd1fKAiQEYx+wu9st5KfsRO38VO5r4R5mTqdvYa9ImvQJTFrMdA6gN3azYwoCdlI/XYr68PQ4BdOiqA5wAaWzQubh5Y2ji1x1h32LkR2NAgMtHWbo50VqW+wK+TisePcznm3qP6uOxyZBfo0tTthmunhpajMIbdruUBbttlJutYRmmIjtEHtcrLDyAeztbBgBN0DhsH0XrEBYMtLt2gUx5wJrFS0HbA5w2gbcAqnFFXRsgO93WmbkCfnqKEDgi9gc63O8uE2L3ZJ6FSjBTmEuGCjWzBC/TxHAW3hzlu6p0013cx8XyuPgM3OzvHoiDim8OPShASwS0RN/sKkoHrQjJzL3AyfLhQXGGULM2gcWWOb40wEBNBqXqQR2zrAx8V34+/QAeUQWpAw1sbMbNmjaV5kG7P34KchouA7UOwGbsZ7tvksBFn49gaUtGi3bFk0WzeAtCGzuG2rZK7j7ESrwTLkp/fgjF7OzSJDcIdY/8IUmE7V9Rmd/f6M2G9cGdm1U/N65Ebh0AOuDhdYbLV76AzS+v+GCJjmxTHKWjg9Py9unkzlFKHNiyuxqXkFbM44gT6oAybCh6j6PDJApSag5b5H7WxN1mKmoWrCdubzJtRWBAEHFfRYp0B8501xXIeNuWgmPlgPu7sK/TrLqJEy1rycSca20dyMZKO8n1ztVMkMRwQDqCGhMbZxy9/ioRoQFjt41e75q9wQI3Y5IkjlZzsIy0DrnP5CYJJJuBbqj4yC+3yERPhAgJSgQ0iTmf3GktZl6GtazUb7sc2yNlSjIvJsoobSDxxmj91KCC09p8gmIWlYTOOceGnc1xe/d86jbN4xEZb2AhwidA6z2DwMlEEyEpPajUa3s5wxPUKd9EKAg166h8U2M6HRqVZfNBVONSwzco3ERNhkXhZYWSYdGoeMCac8QYjNQNWZcGbCLeV0pOYFYSLLCnDAqEXjnYAkSPTcVr5AFp1Qe1E76nV5w8NsXqGF8l1poMHQLQhsnvl1zMdJGBCOuV87B+GhfgdzyfJ0mEefGid9QgQHkzJ2Epa5zctzdxyihmfYCRwx2yA3FEYuzM2I4bPXhtVLG61kFnRTpDHIIYvsaYmugQ4SkAdLieAwrotERzQQwXlsRA9QAH18eB76MEhcjuqcbYW8g7DMbJ5+jroOLAoj6pIGQTIWL+/bbouO7LwQYIIgzWLnjm+ecC1s4MTva/rUs3pP2uCFdE9D28GQTduYZLXyRjriNrlQC7FUwJeSy9PMubghfAScQOqQYY7WettUO2BzHkT1mpV84T2zrIJQgfSH1ajPh4cyId6JXcuUks16jkjNKJzWO943RdxbMSMTFiWS6+TYRhnX305PwjEiIDMlnE3GijlMxMjymMv9DjEKnAg2zS7A1/NQlzisOlgUU/A+pDH7ZUNKZ0PkKSODGIyY2tJLDplzGxgHuxU2sUnGldExbeeYYqCMPawqbUbaNd2AhfkQGwnmye/0iREh8wy4xCBstgM2Fxmp5eeYHkHxjlVNFRPxllMj2Xc6IbIUyzGxzZrNzqc3BP4YIkmIHlllAIanAhno10pEBZsXroE/q8gJHB81gF6OIUyvwOW2Jouw2Ttp/D4uMs3btJFRXl2stYrA/FnkIlg4u3HYUE8jRe7FSkMlCUv2sMT5xD9ct1XEWeSIhbReAQBbahUE+bwZXp/NE20HpkYQPQoKlOu9CJvrWqdzt9S2QWCcCMTCUy2PAO7/lELV/g5ciD4YrKoQdczxLJ65CVmPZTdQowmT6AYKba1n3p/f5zWo7h4xlmtP24QPmTqjquabfh51fVOfFjYN2rhQKCUAZDpMgE2iXMAc2lQSOE12DqDEfCfaw3r8R2eYwCZkfYpzUcEWdS3l70HzIDwPsN+KjUci2cJhODdNhTvo4czsGfHraV77/iJsLmqeQaHPHEsT//C+p37kRotHzUzhc2En2gbxwPiIZSo79SZK2KCcts80T10ElgNa5oDPhRBbp1Pr9bweZis7oRYQZdh80kLsAmzusXeqaZq/0xAZ4cFhDs9qNerPZothKCqixyN74G6GLK4VPW2CyupVsmB0+SCLmI7X/hjdITSOoOTBHyWADYiSdzxEWAgVH19jAfr98czdmjfSrH1at1VdaRQCbMvtnsY5dXh2flx8g64F++gzRwaz/GDr3CljoZvNK/N20ffFpAnNJZvfmsGvbVJ/pFxcTjFDktnn2zUdCZsT3LYIhMOI36gbddZ6iGC1pjGKNkQsbCbEbKEdRqU9uSYquVPPmSvDWGMHRhlI+MqKATztaxuwquYh9ejnhcWExBGazDS/XfMF2NyjlXYscnRSgw/bBlLAgdogFFZ4yyGjKJfwMf1d32cFsgfXJ+f1MvTQDjqp6sYaB3bKtKyh//Bz8cx1ESpG87c9fvt8uZFLNWGbe7/IjjdWRl/Khgz4c+jg8/ijXWjci/jibPet+0B5UEAD40Ey14nH3mrlhvZXwQSJwLQjH3dee0jkSkSawOYOqKrDOKjrkEXj88p9MKq8x+GpRigAW/G02x5srtuDwo/i9/pU2rJvIZWjTxOl9t0MdYk74EQsci+glZ2W7bU62Zk7odeyCJsjIUbauWmgxjoFQjyaYXE/xDsZpPUbzX3C5TK4maZm1212ivU1GeNsg9NjqPRHkCYHP/Njvec+HiLwaJq3h1HO/JXqc0Ql8MRHD8iKkPShFVolzaoytkNpFrrPPEcQvkJw5O9NA/NUkz/UYkrpM1PgBIyPB0e4D26C2LcyW7KysY5ddz33ADYnPtVSPkrO4cxPBAOY9K5XX0AnEhAiIx4N3KzY3dVdrWxQswHmUBdzNUdaBzOgKIKwl1eK+WAEoAiD1QX56rDVMJKzIuxyLQawGdmXvcxTzwFKndeowObxQUmwQ+hZZ5hKjs2bLbspk9XdOhAEINQe6kufs35wR0Tp3f1B8ay5A+m+GLNVIjZ3PQZmZilNtP19wDZXdsDKAm7n8dEecA0YMssKdLS2MS8v900zI0sr1xDBacmIMd9z2r2TYqjyjAcRFCIzGGLOJ5FZkwx7EXe5Hj20WH8/gM292rUCa+Jv4bmrqN2koCQKIqEyME/vZ2AtCCBzNDx8Sp9n116hiflqMzuLolqyUpQ7kEHjGerSgIln51msE+khQP82W62nBHs3XbSZC5s3o+AzLZhAge1cCIyZddmtW2GqVlN7Cqkcl7hqd1dsywxR+puQfmn2rAUgiTZPahctC3VRpzrdXL3vWFGAdi0ez88LHF/uUg4M0MpkLAJ716UcATCkRUpakbU/47xH0DNB2mYw8oFaFWpbJkBWgae6HMsNFs77ynesCK2vqZnNm0HOKqPrXLQshAdsNRFqD1yyaLw/785bg8OGlGHBzgrB2umvmlvDDAnjmBhX5YN1rpSkAEVgy4tQ2IrdWhHuGGKfyOZtN4ObdCPP6jAU22YDCLxJZW0xVuByRaiBBljXk89SgT/n7dmwb3zoPeASttDylW0pxQpMrviosRCfTvNca6CB6QFRW+EsHF7YOxADhMzSXC6zl/oYT/XT+rZlZpsXyYK5AvlDnpRMSblfMSROqsH4iLn8mvYg2MCdWbCfj2TzRlguzFOcXbd9bEiEsXchOQOkkKzPXeziHWpDkKHwY5MQHw4/aTPYObG5OCtNGkI9sYsUlld7u20GYpQV0A+xYStmqTzmBJq3csHVAiOHJzsZ7c+srELdR27sZRGhfVqXss1zAXFgURPCUpjp0qRyHqB50DaBRro0XkCFZ8paXzl6DPmcW4NIsGaOJplew4pQjvFtw6d47VH7kYsxuWjXsLyu06CV04T8KV6cy2ntYtaB6osLYa5n5KvrqVuM5Xpco1jh5i1ZEKptJJar5yGwEML32rmz2rwebA2iG+Fu3ej55lJoHJFjMaAVlqFw/wr/p5GIMxuRRf/hdBfVbdZXmALOyLDnDrwgBZHANpT6ooIes2qzYQwzQokZcpQb44Q2b3UHDbQ138mZRiLbkJdUMJ9ms09YiRYGhLMblfPCzoIMsflftJnDDWRx6a/J7xyxBeHYuEg63XmJhpEYaGd/PvaKCekh2yq8bsed0OaNmFOtnTE1T3WeTl5scXO7R4Jg9ZA+HljHKnYWDgFlG2pHAbEQWOBWZl7DvnkrFrQOZAhalbpca1JUwGTPBdljdvawzVa4J/DzjtlJ1Y2jGBe93E5ekK2WhfXnnSsz1VEZsH+IwGh1mIbVNFAMKm+uRAaRToTy8zH9ZOdnbBU5RWGWbj+1hB2PYcuJ1IpmrByzyhPmyvAMNE8XnDWPxi7djeDwHREStAraA4KSD6ZJSVWE2kyw0Bxqp/wNGh0xRgvkA6wRMy/5N8gMWJGsnxeZfXdXOEcM2XY8vdJdk6OKg/fYsFkwYUnzRrtnFRLGfl5p6O1Y97EyJzhNWM99P4SsqJmSSsJI/GyqoMMrIjfezOnhNv7O6jWZUIFZYNZzwJycCB+1mMyII0Agx8AZZ/UbxxSDnKzYs5VjjkGq+Lxn1rxqo5iQWO1FDemN75cFsIX2mhQ0eODlj+aGUMBaVdPM2aaQNOjtD6JX7RZ2abU10G6ch/OxTdhxVGeFZZ9S81qhn9nmdRiqOelgiNCirY+9vAEsOtkmiltt8oLbQmiXJ4E5+zOfOIFydKudgXA1jiqhLzkfUz8WCuuSoCGE/tf7eb1dW9J7akNUQifERJ+zh6SoLTa0Fn0EPhnetI2aZtEbQKHXb3rmW31GjB3RaI4+4H4l4nEOzSs3+/Py82aOdubcJ4fZc3/m9zlMsi7Gyy3yoMAtfD4NgbFoyHKI1GDUszQx0xE7rD97bJtXmpkz27wRAer4hghjES5f6iNjPCaK0BlL7GUoK2AUk3YtsE2IRHk9YpVoPRahwTVAApgjtjBLJSxNH9msZ6l5q4yyBy0LkDil3ZGPY98n0MjKs/oxaazQ1nEZjKC81bpQltwjAE5WqkFuEiEfiZ9nM6aav+LH/c/YvCM0Dwvsub06RgrBil2jq4D+OPHdmG8TMsO5KPaULQpuWrIw24Tn0LxyYzxDmzcLGUU7uyI6LtQiuGyam7+3K3C8Ys9Wjvmv8fP2aN7KTQ/gtslkrEDgSiir/U7AN0Z88Nl5+F4ggthnJJT3DRLouFK26c7s5z3EPqza3A7xmdq3mYPd30zsP0RxEhpIMcISZf4IfBdzxyYI0hRbtYL8/dhmUFK4llfbQ8RGWjk7j36uj2HVp5xAcOW8zVV7Oda8/wB8dLEsMaPX+QAAAABJRU5ErkJggg==</mdui:Logo>
- <mdui:InformationURL xml:lang="en">http://www.sfpkr.si</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sl">http://www.sfpkr.si</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfpkr.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfpkr.si/simplesaml/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
- <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.sfpkr.si</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sl">http://www.sfpkr.si</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Aleš</md:GivenName>
- <md:SurName>Žitnik</md:SurName>
- <md:EmailAddress>mailto:ales.zitnik@sfpkr.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Helpdesk</md:GivenName>
- <md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>mailto:info@sfpkr.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tomaž</md:GivenName>
- <md:SurName>Ferbežar</md:SurName>
- <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
index abb9a8b1..0a6ab487 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
@@ -36,44 +36,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
- LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
- 4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
- nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
- NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
- iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
- gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
- sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
- OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
- pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
- A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
- 0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
- klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
- BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
- kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
- MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
- MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
- MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
- CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
- ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
- KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
- ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
- mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
- OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
- U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
- 4jGYQXK/vvWeCfE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -113,44 +75,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
- LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
- 4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
- nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
- NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
- iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
- gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
- sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
- OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
- pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
- A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
- 0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
- klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
- BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
- kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
- MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
- MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
- MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
- CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
- ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
- KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
- ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
- mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
- OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
- U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
- 4jGYQXK/vvWeCfE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
deleted file mode 100644
index eb1290e2..00000000
--- a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.smith.edu/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor errorURL="https://idp.smith.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Smith College</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for Smith College Shibboleth users</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.smith.edu/its/about_its/cis_program.html</mdui:PrivacyStatementURL>
- <mdui:Logo height="88" width="504" xml:lang="en">https://idp.smith.edu/idp/images/logolargest.gif</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smith.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smith.edu/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smith.edu/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Smith College</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Smith College</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.smith.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Karla Borecky</md:GivenName>
- <md:EmailAddress>kborecky@smith.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>John Crowley</md:GivenName>
- <md:EmailAddress>jcrowley@smith.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Eric Brewer</md:GivenName>
- <md:EmailAddress>ebrewer@smith.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
index 99bcf5eb..57e7650f 100644
--- a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
@@ -14,6 +14,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
+ VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
+ VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
+ aWNlczEdMBsGA1UEAwwUaWRwLnNvdXRoZGV2b24uYWMudWsxKDAmBgkqhkiG9w0B
+ CQEWGWhlbHBkZXNrQHNvdXRoZGV2b24uYWMudWswHhcNMTYwNDEyMTI1MjExWhcN
+ MjYwNDEwMTI1MjExWjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREw
+ DwYDVQQHDAhQYWlnbnRvbjEcMBoGA1UECgwTU291dGggRGV2b24gQ29sbGVnZTEa
+ MBgGA1UECwwRQ29tcHV0ZXIgU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zb3V0aGRl
+ dm9uLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bzb3V0aGRldm9uLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw780rAsk+mJLxAxM
+ 4AJfvZBzfb4l9Vpu/6BO8Or54rmp/uThhC0mgdoJqQlmaEb4ZIK4/CbfstV8Qo3s
+ INiy6Z1+xMVcrBalH9gG6cXB7i1E1vDuUE5gg/qd1KGCwXrVBDKGKF1enpMlOBgQ
+ cTHZ2dpTf9Hgjmxcixa030ETpvmDyja86dYnQnkxGpXbIyxJR9h7XlkGXzd/fdP0
+ dk45mXkzna05QThcg6SqMlZasi4iyd8UGulWAg7sYBIfxI3Xm88PaTm+KscBCVPu
+ Ma1WatglA9JIBlQwWantChP7AI9v4YZGG+af6uhp1l8UzXA8EdQL6lCwqvmgGD0F
+ 1RFX0wIDAQABo3EwbzAfBgNVHREEGDAWghRpZHAuc291dGhkZXZvbi5hYy51azAd
+ BgNVHQ4EFgQUivSrY0v+NvStP9sX9z4xYKNpba0wHwYDVR0jBBgwFoAUivSrY0v+
+ NvStP9sX9z4xYKNpba0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
+ RO80zk8JjZ7UpVODbHxiyAzs1WX4wIoUc8VR6Cpf55/tTUEBhfU1sHggV5J285Xk
+ ngRf3d+5xcnqO+RjMPn7AXU35ycRofFWsDNtabcWoXK4X6pYrYUAQEsZu/4Q05qJ
+ jzxP0lDW16HRN+JJs97Lel95y8tvhyGhc6VTLzwvOMBCTHeWhuPmlzAZmh3w3hLz
+ f5rIu2knlPysAdyln9PGl1tRSchcjJhN2K/Bq2xVSCFWmGjZiENHc2yfpwc+z7Xq
+ As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
+ 9Ia6HkphVIymnefQl1ZO/Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
@@ -62,6 +94,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
+ VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
+ VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
+ aWNlczEdMBsGA1UEAwwUaWRwLnNvdXRoZGV2b24uYWMudWsxKDAmBgkqhkiG9w0B
+ CQEWGWhlbHBkZXNrQHNvdXRoZGV2b24uYWMudWswHhcNMTYwNDEyMTI1MjExWhcN
+ MjYwNDEwMTI1MjExWjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREw
+ DwYDVQQHDAhQYWlnbnRvbjEcMBoGA1UECgwTU291dGggRGV2b24gQ29sbGVnZTEa
+ MBgGA1UECwwRQ29tcHV0ZXIgU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zb3V0aGRl
+ dm9uLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bzb3V0aGRldm9uLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw780rAsk+mJLxAxM
+ 4AJfvZBzfb4l9Vpu/6BO8Or54rmp/uThhC0mgdoJqQlmaEb4ZIK4/CbfstV8Qo3s
+ INiy6Z1+xMVcrBalH9gG6cXB7i1E1vDuUE5gg/qd1KGCwXrVBDKGKF1enpMlOBgQ
+ cTHZ2dpTf9Hgjmxcixa030ETpvmDyja86dYnQnkxGpXbIyxJR9h7XlkGXzd/fdP0
+ dk45mXkzna05QThcg6SqMlZasi4iyd8UGulWAg7sYBIfxI3Xm88PaTm+KscBCVPu
+ Ma1WatglA9JIBlQwWantChP7AI9v4YZGG+af6uhp1l8UzXA8EdQL6lCwqvmgGD0F
+ 1RFX0wIDAQABo3EwbzAfBgNVHREEGDAWghRpZHAuc291dGhkZXZvbi5hYy51azAd
+ BgNVHQ4EFgQUivSrY0v+NvStP9sX9z4xYKNpba0wHwYDVR0jBBgwFoAUivSrY0v+
+ NvStP9sX9z4xYKNpba0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
+ RO80zk8JjZ7UpVODbHxiyAzs1WX4wIoUc8VR6Cpf55/tTUEBhfU1sHggV5J285Xk
+ ngRf3d+5xcnqO+RjMPn7AXU35ycRofFWsDNtabcWoXK4X6pYrYUAQEsZu/4Q05qJ
+ jzxP0lDW16HRN+JJs97Lel95y8tvhyGhc6VTLzwvOMBCTHeWhuPmlzAZmh3w3hLz
+ f5rIu2knlPysAdyln9PGl1tRSchcjJhN2K/Bq2xVSCFWmGjZiENHc2yfpwc+z7Xq
+ As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
+ 9Ia6HkphVIymnefQl1ZO/Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
diff --git a/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..698cf182
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.udu.cas.cz/idp/shibboleth">
+ <md:Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-08T11:34:01Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider IAH AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚDU AV ČR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.udu.cas.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.udu.cas.cz/</mdui:InformationURL>
+ <mdui:Logo height="44" width="121">https://jiftach.cas.cz/loga/logo-udu-44.png</mdui:Logo>
+ <mdui:Logo height="476" width="1309">https://jiftach.cas.cz/loga/logo-udu-476.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
+MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjgDKLkK7EFE1F7ykATltO3yuw23qm6
+sgNMSENfnP2qImMzDf4nmKLScVkyyzWPsmoTVMcB+WYiYG6gT+bxEMmyQfOruFrq
+mejArIup36YBrC14etLe7UemOe7IIWprPQilDNlzp0Gaehj23PNQvBwfHV9jMbLe
+iRn5YYHNd3fmn9G9qRFfnBpxjbaIH0TC67CO+qX+1Pq71LmTkA7TCH1MYRflCIv0
+E/oXVjTGvt0LFiqtRrOaYVEX/N75z6/8T3CPZdJRF1mHZoxe2x3F4fUCs6fjhrDy
+DF/VGiK3P1+oq/YKSO9xWfFfBfUe6qIjA4hX70cpyWHXVjku/03M69ECAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVkdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVkdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJBCKe7lHF0NXla0FKN6rEVR
+42qDMA0GCSqGSIb3DQEBBQUAA4IBAQB0gFLUDJN/iJXYI5r9cV4/ptJUosnsB283
+JChXltB/yGffjAHQW5dUqu6JqT6xZWkqP5ECzGE3Php68Ww6xf9uZg3LpHCfV/NP
+TI9m+1u6JzuE8FxY+7pipTnqJUfdbYMVRGxWA7okyEsgxBNdQTu76AR8IA7sQ/2C
+1xMyevj8KiNC/mvPnfKAknGXZbeYWRSIR9t2olH4tfvckXuHDwZsBE2BgATxNLG1
+nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
+yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udu.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
+MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjgDKLkK7EFE1F7ykATltO3yuw23qm6
+sgNMSENfnP2qImMzDf4nmKLScVkyyzWPsmoTVMcB+WYiYG6gT+bxEMmyQfOruFrq
+mejArIup36YBrC14etLe7UemOe7IIWprPQilDNlzp0Gaehj23PNQvBwfHV9jMbLe
+iRn5YYHNd3fmn9G9qRFfnBpxjbaIH0TC67CO+qX+1Pq71LmTkA7TCH1MYRflCIv0
+E/oXVjTGvt0LFiqtRrOaYVEX/N75z6/8T3CPZdJRF1mHZoxe2x3F4fUCs6fjhrDy
+DF/VGiK3P1+oq/YKSO9xWfFfBfUe6qIjA4hX70cpyWHXVjku/03M69ECAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVkdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVkdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJBCKe7lHF0NXla0FKN6rEVR
+42qDMA0GCSqGSIb3DQEBBQUAA4IBAQB0gFLUDJN/iJXYI5r9cV4/ptJUosnsB283
+JChXltB/yGffjAHQW5dUqu6JqT6xZWkqP5ECzGE3Php68Ww6xf9uZg3LpHCfV/NP
+TI9m+1u6JzuE8FxY+7pipTnqJUfdbYMVRGxWA7okyEsgxBNdQTu76AR8IA7sQ/2C
+1xMyevj8KiNC/mvPnfKAknGXZbeYWRSIR9t2olH4tfvckXuHDwZsBE2BgATxNLG1
+nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
+yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Ústav dějin umění Akademie věd ČR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.udu.cas.cz/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.udu.cas.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Vaníček</md:SurName>
+ <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
index 37b1ae3c..e31111cb 100644
--- a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
@@ -16,6 +16,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
+ OFoXDTE5MDMzMDEwMjEzNFowgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDEuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAIfVik5J16T3kGyLocrYaK+15zqqqQN/h4RYYRVYSsPk
+ MX7srSQJq1nt/svUTKWBllfwySXccVX2YhgM/nuTbJtf6yKGNq1ZogsjRZv1m2rr
+ yOHVwQEpFpGfdt0MmXVR1bvEi5O3+U+Ian6A8oTQMgmhVCXCTTdt3fAeYqN6DlwQ
+ 38JPFhIlbyEhrUgCnZeE19ftAdfAiwXD2bJy0hnuMh7j8PKIwsWkAx0a8BdQ1LKR
+ /TgJhluGVZiMXgS4cljX0SJS9+eXIvNC1V+EMM03dOrP1mPJIfxY2mrEfwDbhC9H
+ 1OKRqdDYnHUTYNCSvhDiApRK7ApeobEqolHOr3cWfG0CAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMS5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ Tw22e+slTxSJFHTxYGz0C7Mw4gowDQYJKoZIhvcNAQELBQADggEBAHh9RRtAH0lX
+ RcmNtw4jrDkcdnJcwjaddVpfQfVvIFGqB4NkKOmccYugppso5+UEHcpHivsMcKAa
+ Qok/yANO6fNzdKCjZIApV9Q9rpwIQSbJlXbg/DvUYc9mqeUKOMlIzw3Q+G1XK4o8
+ B5HfGyldcM8X+NyiC8tocRG4iFdMT2J4M1cIfeDn9xHPDzWex9bZLktLkssdzjtw
+ iKTQHPv55BOqJ12e0rTNTilpErtzr5AhYXDKKNYAHTYxHcyI75aqE+/11dsHdOKb
+ oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
+ ayT9vCad35E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
@@ -61,6 +97,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
+ OFoXDTE5MDMzMDEwMjEzNFowgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDEuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAIfVik5J16T3kGyLocrYaK+15zqqqQN/h4RYYRVYSsPk
+ MX7srSQJq1nt/svUTKWBllfwySXccVX2YhgM/nuTbJtf6yKGNq1ZogsjRZv1m2rr
+ yOHVwQEpFpGfdt0MmXVR1bvEi5O3+U+Ian6A8oTQMgmhVCXCTTdt3fAeYqN6DlwQ
+ 38JPFhIlbyEhrUgCnZeE19ftAdfAiwXD2bJy0hnuMh7j8PKIwsWkAx0a8BdQ1LKR
+ /TgJhluGVZiMXgS4cljX0SJS9+eXIvNC1V+EMM03dOrP1mPJIfxY2mrEfwDbhC9H
+ 1OKRqdDYnHUTYNCSvhDiApRK7ApeobEqolHOr3cWfG0CAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMS5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ Tw22e+slTxSJFHTxYGz0C7Mw4gowDQYJKoZIhvcNAQELBQADggEBAHh9RRtAH0lX
+ RcmNtw4jrDkcdnJcwjaddVpfQfVvIFGqB4NkKOmccYugppso5+UEHcpHivsMcKAa
+ Qok/yANO6fNzdKCjZIApV9Q9rpwIQSbJlXbg/DvUYc9mqeUKOMlIzw3Q+G1XK4o8
+ B5HfGyldcM8X+NyiC8tocRG4iFdMT2J4M1cIfeDn9xHPDzWex9bZLktLkssdzjtw
+ iKTQHPv55BOqJ12e0rTNTilpErtzr5AhYXDKKNYAHTYxHcyI75aqE+/11dsHdOKb
+ oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
+ ayT9vCad35E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
diff --git a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
index 7aea853a..ef9cce30 100644
--- a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
@@ -16,6 +16,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
+ NVoXDTE5MDQwNTEyNDUzM1owgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDIuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAMvR27pSvNdN412CLQs9mwht4/x7X7GFyo95R7M2ebA8
+ NiWWpeO1a39mQAy0aA3jgI3dLM7FkvTAAe3PwjGG1ONoNzXkdF2ys+C4jf9Tgsl7
+ grv50GeFEckUUrvzgaMyZHZZmOwX9oc6AQCPw57f2UHv58LWYivz1Mmvp2JmnUiu
+ UX574cgLN/KnRMTWl4sWvU3nwY+ZurTI8pj2B6Zj28hlPFbl6lNqd8jlT1j3+O1o
+ +7ubSVvRV5rYy2CWxjGYDxEnm+dAoR7si3XxubiWXe4KIBwvbE9ZQMMjQ3d3cw5T
+ lQwv9S9UQGEfNmDLZnRhzOit8KPqDk/p3Lc29mp/9nMCAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMi5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ bJMoUGiBSfBEYv7zyHqX1fXLSkcwDQYJKoZIhvcNAQELBQADggEBAL1K6/RF+FdG
+ 0xpK1XVOvFsihV5P4OLXk9qhHh+CnKfDfqbJZTvppj1or7bi0D4GyIZQRqF19z4n
+ dPB9ckfJF9YvyfR7uobHUJBm644hsxa5DTAMug0nHnDnHN/ueE0fBc8Vr2N0adZV
+ rlVcGRjXiBVPxfTk637ZIXShW+8923IIU/eECYc7Vvpe7giXfRF9SbFtAZ9/Rdjm
+ YWMVdt0nBLwXSCdh4IIKHHnu4qq6Z0/RpWmA6iL/Y/hJzQAohoU/K7jGqPOMm9wF
+ ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
+ IklcmjJ+40A=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
@@ -61,6 +97,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
+ NVoXDTE5MDQwNTEyNDUzM1owgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDIuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAMvR27pSvNdN412CLQs9mwht4/x7X7GFyo95R7M2ebA8
+ NiWWpeO1a39mQAy0aA3jgI3dLM7FkvTAAe3PwjGG1ONoNzXkdF2ys+C4jf9Tgsl7
+ grv50GeFEckUUrvzgaMyZHZZmOwX9oc6AQCPw57f2UHv58LWYivz1Mmvp2JmnUiu
+ UX574cgLN/KnRMTWl4sWvU3nwY+ZurTI8pj2B6Zj28hlPFbl6lNqd8jlT1j3+O1o
+ +7ubSVvRV5rYy2CWxjGYDxEnm+dAoR7si3XxubiWXe4KIBwvbE9ZQMMjQ3d3cw5T
+ lQwv9S9UQGEfNmDLZnRhzOit8KPqDk/p3Lc29mp/9nMCAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMi5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ bJMoUGiBSfBEYv7zyHqX1fXLSkcwDQYJKoZIhvcNAQELBQADggEBAL1K6/RF+FdG
+ 0xpK1XVOvFsihV5P4OLXk9qhHh+CnKfDfqbJZTvppj1or7bi0D4GyIZQRqF19z4n
+ dPB9ckfJF9YvyfR7uobHUJBm644hsxa5DTAMug0nHnDnHN/ueE0fBc8Vr2N0adZV
+ rlVcGRjXiBVPxfTk637ZIXShW+8923IIU/eECYc7Vvpe7giXfRF9SbFtAZ9/Rdjm
+ YWMVdt0nBLwXSCdh4IIKHHnu4qq6Z0/RpWmA6iL/Y/hJzQAohoU/K7jGqPOMm9wF
+ ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
+ IklcmjJ+40A=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
diff --git a/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0c5542e8..00000000
--- a/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.kirkleescollege.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for Kirklees College.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-09T10:23:23Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Kirklees College - Testing - Do Not Use</mdui:DisplayName>
- <mdui:Logo height="67" width="137">https://www.kirkleescollege.ac.uk/wp-content/uploads/2015/06/kcLogo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
- oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
- wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
- vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
- ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
- n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
- hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
- 4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
- zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
- ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
- JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
- dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
- yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
- iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
- AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
- q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
- qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
- m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
- pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
- AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
- 002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
- uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
- uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
- CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
- MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
- bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
- Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
- F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
- kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
- SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
- KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
- fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
- a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
- bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
- FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
- T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
- IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
- f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
- hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
- oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
- wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
- vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
- ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
- n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
- hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
- 4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
- zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
- ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
- JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
- dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
- yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
- iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
- AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
- q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
- qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
- m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
- pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
- AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
- 002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
- uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
- uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
- CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
- MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
- bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
- Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
- F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
- kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
- SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
- KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
- fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
- a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
- bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
- FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
- T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
- IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
- f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
- hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Kirklees College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Kirklees College - Testing - Do Not Use</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.kirkleescollege.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Sam</GivenName>
- <SurName>Lim</SurName>
- <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Sam</GivenName>
- <SurName>Lim</SurName>
- <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..d0dcfe24
--- /dev/null
+++ b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.lu.se/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
+ <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
+ <mdui:Logo height="78" width="450" xml:lang="sv">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
+ <mdui:Logo height="78" width="382" xml:lang="en">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>lu.se</mdui:DomainHint>
+ <mdui:DomainHint>lth.se</mdui:DomainHint>
+ <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUD4RyhLFIuNZ5O77xXaRFLYeZgJAwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA2WhcNMzYw
+MjIyMDc1NDA2WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJlUtfZBGTW2+XOD2UgwN/KFkrfoyaDrc/CJ9DnG
+rDjHJjlN2Fey7rB3sexvyM6RfLpxkOX7LKcwKBDq3Rjh0IyGUyEjolPls8vlPORz
+WyLGJ/JkXSRYFnOniQxeqfL2Xjo53Hk0yOFUh6gLiRSxla+EueOHwIeXkXhpTYz5
+K8O7lXwmGhS1+kd4HJZFOB8YOYDqaxMHOvcAJH01Khwe6HB0x/0MQ3LTMF0YusHv
+Ob+WjFNGZs5qX7KJcQLEhrzgBhyFVLdKX024+JREzMB7AhNrysuh+h9tLC0oUVPF
+0y0Xf+L18dCH92UamqR3IOC7k+hytZ6QqMnKIq8whXzrpeECAwEAAaNdMFswHQYD
+VR0OBBYEFFADTOECG3DC6WFR7tlcnx9pcn0oMDoGA1UdEQQzMDGCC2lkcHYzLmx1
+LnNlhiJodHRwczovL2lkcHYzLmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAKSwpkEGkZmQPyB22U3bSWcI/QpZlOzNvWMaGaFvwmI+Vn4GS7
+gaPW03B7Pnk71MaPnWXzbDOWvKVMhtkNJiZNSldPqwqt2RnR7SS+af2XbQDqJS0n
+Wb4jgXaO25MLslWrOIeuUn4nfeO5JrUDialovqlN4Om8rn6JPao4wGEiqts3HeAB
+xCsMdAMr8CrJMoK+1sBIgfIr8nBuIo3SvXAsHd6ts0xYVqgeYM6qPg97qiHytJvU
+RkaCJ5ca0ZutSetcL3mkXdHIl+5S9zhgcs3hOLA6v7Yqsd+lWA8Jqh4wbBXixpGu
+cGOFP9UH1ptYCE+azH3kJ0N00MmrXdZgH323
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAOAJRp4FcZsN0Apk6n6NJRREV+6VMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC2lkcHYzLmx1LnNlMB4XDTE2MDIyMjA3NTQwNVoXDTM2
+MDIyMjA3NTQwNVowFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCrPl5u1sQ/6/O9SZFlQHOIxewNK1HpNe9ZSXp+
+91pIlOLiJb16R5rH4KFLzFr6XEghwyNreduL4NSHwnS208rU0UHGnPFK58e4WSUY
+4P5RJSipDAGY1oIIrL4kBrpM50Gwhyxj42xXTq9evG2RsyyeLaPSJePlLtotPt2o
+41RBvW1vzYNcXb7JgSx8s5px6jdtjm+BtWgZtscFomSqSGWFm3/TLo+gntvG4/xT
+o1K9zlDuqfbHIMjD0t8wI4BYX3Wd7pXYNf6i0oXtOpS/9Khae4/orA9d1+8xadHM
+XID2Jk0OdvfEeuTbs5AlUyDlvQgc5nUZUVRvKwqtSSv8pbZdAgMBAAGjXTBbMB0G
+A1UdDgQWBBSxffHocHR0RA65Wd8uRplMXh4VFzA6BgNVHREEMzAxggtpZHB2My5s
+dS5zZYYiaHR0cHM6Ly9pZHB2My5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEARk9ha/w5IQs1qKygFTFsCAWkrpAhnOVMeXWCPG+7yzYliCQv
+XX2shOz7RlQpZT+3uyDSWgJ+Z2xdISsThXbDfnMJnU5bbUXSgUy+CYkXjx8lI5b+
+RoLi7bzycPuGIFcOjUzfZxjM5mDxpVUmGP9e3cnosNUAI0iqt34nQwusx+jRZqOi
+HEa8UnjwOtglHEiRxQwyildnenAuXn37ZEe1n9jLiMAzPRFVxIrnuSyalUSyvGc2
+6c9Aozb+3ozGufmWcuVc6wZeZtGdHYRT3N1uVBN2agzRNrlhcuP/gDDjhFHlFMDs
+4YT1j/q6c6UU7MANv5mTzc3hL5MSrvj4CCpVgA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUauI49n1u/B9z1f0b/KUMu1vDD3EwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA1WhcNMzYw
+MjIyMDc1NDA1WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALNlmrTcOU72uwaA3T0pe1avdrzmjEH+Yq9fhbvz
+Jbm8jorNVJot4nLTwXrE8zubuVyndPNYda69SKFW/H2sdsPl6nXiMQv0p3Izw1Ee
+bz4zwWbvSVu7D9ohvwWR5MtV0a5sGkQW8oylyHMS8mwtp+HPEO66D8NDracxZ7/p
+kRobp16SXnsq/jekkFpph5AHsJjRTsX93vB2eFZ5+g2Yx1JloGHuSxQvkgFUktek
+Xf2i6NZYj1Vgr21woVvO6YoErrqrfjtD5ul/MlWD7V8BNZA1I89huTLBMqbFtT/R
+q3vjkHiFDgzyiOSrH6KwcYWdJuNHVISHOOYJil8Gl2eYj5UCAwEAAaNdMFswHQYD
+VR0OBBYEFAOF0q/Lew4bO5kzUKLTi4sKfi6PMDoGA1UdEQQzMDGCC2lkcHYzLmx1
+LnNlhiJodHRwczovL2lkcHYzLmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQCwGnCjGcIYhmoKwhcyHmEI2npMZ0zUMUjLxcpY8OjJFXGDUi9j
+fJlhja02L7O/kiRdVadhlIqpi5g3aNwoNyVxLbriiToDNIIm0ixrBMGWoUj9WYe6
+rA86XwGeATly1iQu9EVWH+nCBYs+MLogsB9qtA/2vd4nCM9jNGe9+PhC+p84l3nK
+2E3SR1RhRynJzC+hpoO5KARTw9ymeeMt4FM8lFXhL3rbUJq/Dl3deU0U6xCzyPDh
+KE7aiSxYsHeCrgDI13bWgb/5xaYBMwJLDYj/KTIrtThku/WU8kDgEZtjcfCWCMiJ
+9rjFqJ/gXzCEj4IVOIWKvE1TswY/c0hymlJ3
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.lu.se/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
index d1b33da9..b05181d3 100644
--- a/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IDP v3 Roteiros - RNP Campinas</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</mdui:DisplayName>
- <mdui:Description xml:lang="en">IDP v3 Roteiros - RNP Campinas</mdui:Description>
- <mdui:Description xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</mdui:Description>
+ <mdui:DisplayName xml:lang="en">IDP V3 - Laerte RNP Campinas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IDP V3 - Laerte RNP Campinas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
</mdui:UIInfo>
@@ -23,28 +23,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxQDA+BgNVBAoTN0lEUCBWMyBj
-b20gQUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMx
-DDAKBgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVy
-Y2Vpcm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBh
-dWxvMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMB4XDTE2MDMz
-MTIwNDcyNFoXDTE5MDMzMTIwNDcyNFowgcoxQDA+BgNVBAoTN0lEUCBWMyBjb20g
-QUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMxDDAK
-BgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vp
-cm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBhdWxv
-MQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo73F8fTol/pz5d0J7htmOwzhG0ZtuQ4wflnk
-zz4ljxpNlmPBGZWWTRIt3GQu0hcTKgPvdn2c+gad8d0GMXDf95xedZTWpVly7yeM
-UN06XEFLT3gGKRua9vUPf3BQebui6SbyR0fYSghpe6X8D/B58vC2/opVUYJGRlGH
-M4b3d/izqwnr1YzMY3cvnNpUsY/wzhhAW+2+Pj/0Zi3y6LsBXllUEPOyTWQBsj3o
-zvZSMlLVq7BFhwrXjuULAsViojuz7jHFtz2OgVu/yioZZ7oLbdJhP2usDPC04uSX
-merPyzwtc/4cnx74h1klYPsSCN4meMto7puWfzUYiyTolRax6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQCC+hshKCqe/q81mgYoTyr9f3FF8QXmKwsvAYBPlPyi+POK
-Ke6LL9Ouh8RIfIj0lBs/RlKiljY34gHXtUEDbEhOAFpFMAXbYC5VG1IG2YyOcDj6
-fYKvW9wqAYwJmxWlDszRL+jySQ2V0mnou0DjtQ3Y7S2/j2HzDdMoGImHxCR8s8W/
-aVit7DAZrZOqQeeIuHb+XJHzK5K5DkeUf1D2LKw1xpVBXc2T25YfA8xU9h9nc/jS
-JAYMHRo55POqq2ikd9e0oDINDN532YSVyUBTTbHL4KmNY62040+TgfRzTOEB16Tm
-PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
+ MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
+ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
+MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
+DwYDVQQHEwhDYW1waW5hczETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMC
+QlIxFTATBgNVBAMTDGlkcHYzLnJucC5icjAeFw0xNjA0MDQxNTAxMzRaFw0xOTA0
+MDQxNTAxMzRaMIG8MTEwLwYDVQQKEyhSTlAgLSBSZWRlIE5hY2lvbmFsIGRlIEVu
+c2lubyBlIFBlc3F1aXNhMQwwCgYDVQQLEwNHVEkxLTArBgkqhkiG9w0BCQEWHmxh
+ZXJ0ZS5iZWxvdHRvQHRlcmNlaXJvLnJucC5icjERMA8GA1UEBxMIQ2FtcGluYXMx
+EzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxpZHB2
+My5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSw9chEqxg
+jyWEbzMawJRqOCSxW6L747AD4Cd2PBDP0kAdUTpLvUds10stn7LJVoe9BGqRbo3i
+FXuD8WgmMS03ADjsdXtQuQcOLPdfdjUpswRMbmrzhwygTqBrwmESpbABz6FsxcLI
+LJYkJIWj03ay0nPSCphwqd/FBbensTqeKyy6f7BMudReOPj93oL6ZOEvadrRx/Ln
+AIa446yMgo4b/BZpxKEwE2taJ+F122ytNW5s5UQVdXcg6t/PU8yqpvt6PUN/IeVy
+ZoQE+1/4a6KglA5HMlL+0RW1pVnF7AnEjuS6DXHlPyqO8FqGRB+Dl0P3yAF2XwTP
+3sXegg/OgoxhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGwYS5Kaft8IZE1p2sPT
+d1MDRJtkBhonCNoc1HgD4bESl6EaSLLcwH40Ued7eXaoXeurhTFNHqY0dpZcZ1qX
+8z9z1ecqN1J2g5jz3z/g+/Pvc/TGxnHANf5ZyTArGcvCDM6mMFlDa440k/UucwFV
+uH84HDKhKM7WB2d2Lsx+Ok9ae3AtE+Jfs7POvQ8OCCg2K/a+MgD0vIPkrjt0Rvqq
+Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
+rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
+BLw=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -67,28 +67,28 @@ PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
<ds:X509Data>
<ds:X509Certificate>
-MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxQDA+BgNVBAoTN0lEUCBWMyBj
-b20gQUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMx
-DDAKBgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVy
-Y2Vpcm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBh
-dWxvMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMB4XDTE2MDMz
-MTIwNDcyNFoXDTE5MDMzMTIwNDcyNFowgcoxQDA+BgNVBAoTN0lEUCBWMyBjb20g
-QUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMxDDAK
-BgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vp
-cm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBhdWxv
-MQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo73F8fTol/pz5d0J7htmOwzhG0ZtuQ4wflnk
-zz4ljxpNlmPBGZWWTRIt3GQu0hcTKgPvdn2c+gad8d0GMXDf95xedZTWpVly7yeM
-UN06XEFLT3gGKRua9vUPf3BQebui6SbyR0fYSghpe6X8D/B58vC2/opVUYJGRlGH
-M4b3d/izqwnr1YzMY3cvnNpUsY/wzhhAW+2+Pj/0Zi3y6LsBXllUEPOyTWQBsj3o
-zvZSMlLVq7BFhwrXjuULAsViojuz7jHFtz2OgVu/yioZZ7oLbdJhP2usDPC04uSX
-merPyzwtc/4cnx74h1klYPsSCN4meMto7puWfzUYiyTolRax6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQCC+hshKCqe/q81mgYoTyr9f3FF8QXmKwsvAYBPlPyi+POK
-Ke6LL9Ouh8RIfIj0lBs/RlKiljY34gHXtUEDbEhOAFpFMAXbYC5VG1IG2YyOcDj6
-fYKvW9wqAYwJmxWlDszRL+jySQ2V0mnou0DjtQ3Y7S2/j2HzDdMoGImHxCR8s8W/
-aVit7DAZrZOqQeeIuHb+XJHzK5K5DkeUf1D2LKw1xpVBXc2T25YfA8xU9h9nc/jS
-JAYMHRo55POqq2ikd9e0oDINDN532YSVyUBTTbHL4KmNY62040+TgfRzTOEB16Tm
-PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
+MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
+ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
+MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
+DwYDVQQHEwhDYW1waW5hczETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMC
+QlIxFTATBgNVBAMTDGlkcHYzLnJucC5icjAeFw0xNjA0MDQxNTAxMzRaFw0xOTA0
+MDQxNTAxMzRaMIG8MTEwLwYDVQQKEyhSTlAgLSBSZWRlIE5hY2lvbmFsIGRlIEVu
+c2lubyBlIFBlc3F1aXNhMQwwCgYDVQQLEwNHVEkxLTArBgkqhkiG9w0BCQEWHmxh
+ZXJ0ZS5iZWxvdHRvQHRlcmNlaXJvLnJucC5icjERMA8GA1UEBxMIQ2FtcGluYXMx
+EzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxpZHB2
+My5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSw9chEqxg
+jyWEbzMawJRqOCSxW6L747AD4Cd2PBDP0kAdUTpLvUds10stn7LJVoe9BGqRbo3i
+FXuD8WgmMS03ADjsdXtQuQcOLPdfdjUpswRMbmrzhwygTqBrwmESpbABz6FsxcLI
+LJYkJIWj03ay0nPSCphwqd/FBbensTqeKyy6f7BMudReOPj93oL6ZOEvadrRx/Ln
+AIa446yMgo4b/BZpxKEwE2taJ+F122ytNW5s5UQVdXcg6t/PU8yqpvt6PUN/IeVy
+ZoQE+1/4a6KglA5HMlL+0RW1pVnF7AnEjuS6DXHlPyqO8FqGRB+Dl0P3yAF2XwTP
+3sXegg/OgoxhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGwYS5Kaft8IZE1p2sPT
+d1MDRJtkBhonCNoc1HgD4bESl6EaSLLcwH40Ued7eXaoXeurhTFNHqY0dpZcZ1qX
+8z9z1ecqN1J2g5jz3z/g+/Pvc/TGxnHANf5ZyTArGcvCDM6mMFlDa440k/UucwFV
+uH84HDKhKM7WB2d2Lsx+Ok9ae3AtE+Jfs7POvQ8OCCg2K/a+MgD0vIPkrjt0Rvqq
+Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
+rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
+BLw=
</ds:X509Certificate>
</ds:X509Data>
@@ -100,10 +100,10 @@ PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">IDP v3 Roteiros - RNP Campinas</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IDP v3 Roteiros - RNP Campinas</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">IDP V3 - Laerte RNP Campinas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IDP V3 - Laerte RNP Campinas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
deleted file mode 100644
index 668c0d8d..00000000
--- a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://javasp.test.openathens.net/hello/oa/metadata">
- <!--
- This is an OpenAthens test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:54:26Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
- QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
- ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
- MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
- c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
- h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
- INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
- 2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
- ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
- Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
- uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
- SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
- 4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
- jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
- r4IsboH0bf7jMEFfq6CCew==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
- QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
- ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
- MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
- c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
- h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
- INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
- 2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
- ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
- Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
- uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
- SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
- 4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
- jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
- r4IsboH0bf7jMEFfq6CCew==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv: Test Java SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
deleted file mode 100644
index 47195d85..00000000
--- a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.heacademy.ac.uk/shibboleth">
- <!--
- This is a 'Higher Education Academy' OpenSAML SP for Atypon Systems, Inc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T12:00:00Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDPDCCAiSgAwIBAgIJAJOTTFp5kRupMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51azAeFw0xMzAzMjgwMDI0MDlaFw0x
- NjAzMjcwMDI0MDlaMCMxITAfBgNVBAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOQ1INQ2UjzPpKIERLZ
- T4ImAal+OGN8XMHm54PSKVdl6oMmXOQW/oshCsm+Wd768BHhfSgajkKJQ9cGLdKG
- rQcPg0NeGlebSQxEAU5EymIbgJdyA03NSAK9C1iPdGkJ5+PNE88eKtQP/cVwa/QC
- RymCnLroxKfquAVvf/iLiTJtx0oIuLS3PaVoqSrBrRU6vJOtim7xaWBaJVmvd0I1
- FT+wgIkHtRRCi6O7ku31n1CfXuBenov/NLxOW1HpLHYqX9H+Mxt5XPjzs7vf3cIy
- hE6c5NVtN9S2qNsXhHvZMB5JQcOk6JFv/K5yxElR0/W53KQN8pstmmXQrSjAliPa
- 8UUCAwEAAaNzMHEwUAYDVR0RBEkwR4IYam91cm5hbHMuaGVhY2FkZW15LmFjLnVr
- hitodHRwczovL2pvdXJuYWxzLmhlYWNhZGVteS5hYy51ay9zaGliYm9sZXRoMB0G
- A1UdDgQWBBRZYwKjd2FZxBTfe1YCf4Uciwsz9jANBgkqhkiG9w0BAQUFAAOCAQEA
- bhkLgMPYt9MdLliyOC7frDpRExeYqYeGQ+LS5vnY9FwT3rAkIlutdaCbqZijh8Jl
- 9p8vRWcKJuGmYSHMxIrciHTmjSkNa/zYLsP3+QGLzre9MQfJZ5YiwMA9ym05xbon
- hgCKylNLWd8lQIIf3joPFBOI5dgfey8dUxoIVk2e1x8YRv2OcNfpkGQkp1HyXs3T
- lLhRoL+MLFM0aKaW18hNnV3Uuhj5OoBKJQCWbtJix2yrO2MUqUNORWsdExS69Hev
- q88umX3v6Cwt6Ri/vzVQOj/4u5vQ6NY1evS6uEYxlnfneEICxZ1WRKqXdA1MWfO4
- aaX1Y4N8Fbb80yxu7/QWIQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.heacademy.ac.uk/action/samlACS" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.heacademy.ac.uk/action/saml2post" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.heacademy.ac.uk/action/saml2artifact" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">The Higher Education Academy</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://journals.heacademy.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>sso-support</GivenName>
- <EmailAddress>mailto:sso-support@atypon.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>sso-tech</GivenName>
- <EmailAddress>mailto:sso-tech@atypon.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
deleted file mode 100644
index 5d550df8..00000000
--- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leedstrinity.ac.uk/oala/metadata">
- <!--
- This is an OpenAthens LA IdP for Leeds Trinity University.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedstrinity.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
- BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
- YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
- MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
- bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
- thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
- fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
- 4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
- kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
- u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
- MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
- NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
- eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
- eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
- ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
- agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
- TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
- +wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
- hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
- BDeKbG3KsdzVqHjcQxeUmsCbRe0=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
- BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
- YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
- MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
- bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
- thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
- fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
- 4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
- kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
- u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
- MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
- NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
- eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
- eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
- ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
- agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
- TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
- +wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
- hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
- BDeKbG3KsdzVqHjcQxeUmsCbRe0=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Leeds Trinity University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ryan</GivenName>
- <SurName>Dolan</SurName>
- <EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>David</GivenName>
- <SurName>Baron</SurName>
- <EmailAddress>mailto:D.Baron@leedstrinity.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.emerson.edu-idp.xml b/swamid-interfederations-2.0/login.emerson.edu-idp.xml
deleted file mode 100644
index 57d03338..00000000
--- a/swamid-interfederations-2.0/login.emerson.edu-idp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.emerson.edu/idp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emerson.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Emerson College</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEMTCCAxmgAwIBAgIJAKN0/KN2I4U9MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVzZXR0czEPMA0GA1UEBwwGQm9zdG9u
-MRgwFgYDVQQKDA9FbWVyc29uIENvbGxlZ2UxHzAdBgNVBAsMFkluZm9ybWF0aW9u
-IFRlY2hub2xvZ3kxGjAYBgNVBAMMEWxvZ2luLmVtZXJzb24uZWR1MR8wHQYJKoZI
-hvcNAQkBFhByb290QGVtZXJzb24uZWR1MB4XDTE0MDQwMjE5NDgwOVoXDTI0MDQw
-MTE5NDgwOVowga4xCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRz
-MQ8wDQYDVQQHDAZCb3N0b24xGDAWBgNVBAoMD0VtZXJzb24gQ29sbGVnZTEfMB0G
-A1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEaMBgGA1UEAwwRbG9naW4uZW1l
-cnNvbi5lZHUxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZW1lcnNvbi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qJbjTbnDdz4MlwuTXhmzog3R5p47
-5BL7eUX9Q6pj/tM807iaKpXlSgakVnDa38o1+Du/1DGEfZ9MhTE9E4yeztuNbFJV
-O9ScKdk6a6hZDIW1YUnWIZrW9v52usKS5Cqs8bmHUCCcFx8jZWnmaS6c6rWkGxSN
-9Kq6AmzClGXID2jubZcEmGPcFjR4Tg4W6Dche3CTZfLHDYRDXxUZ3qpcNVVhcFSx
-vCkDNr0U9ZGsw1V/kHd9dnGvonhezaJDTiDhUI1xyw/qnQdWsqnrFfMDMmdaRq/O
-nHXJ7X+H6eZ0wvluz4IBt4r07LcXBn7yvZTRlVBdDThol++6XFjWJVuxAgMBAAGj
-UDBOMB0GA1UdDgQWBBT6TymEH+rN7J/JGdpM7JeW+38OhDAfBgNVHSMEGDAWgBT6
-TymEH+rN7J/JGdpM7JeW+38OhDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQCMgG0EPvRcyDfcGnUYJmIgiYV8WVg3gILPUQ5T6tPcHJxgvfIcqFigAgWI
-6A/5rD3m5bVGcj+GfOZ4icDvj5Lftd6uAsu+JTXxGfxMJwoqIozx2hLL73usS21V
-rZRxatE0IT3F2oWz0eytE82OMCfvwBCBk71IkWN0orTTyrbYGZhvxJWVRtxUvfZ+
-LEa73Iu/Zg51/frqYYHoBjsX5rVT3H3rBhJqrlHjLS9Fw2Pay/TxAwp5FPC6zmCK
-XYfrkS9wsWKpmuK5J1Xlup8MqqwguX3zRaIFfYUW1c8bLkP7HCA1YTb7pImqBE8Y
-fRerJbNBdbk8AnS/5GdSLL1oSuHK
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emerson.edu/saml2/idp/SingleLogoutService.php"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emerson.edu/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Emerson College</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Emerson College</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.emerson.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Francis Frain</md:GivenName>
- <md:EmailAddress>Francis_Frain@emerson.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Bryce Riner</md:GivenName>
- <md:EmailAddress>bryce_riner@emerson.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
deleted file mode 100644
index 03ef9f34..00000000
--- a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.feld.cvut.cz/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:33:26Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fel.cvut.cz</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
- <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
- <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
- <mdui:Logo height="40" width="53">https://login.fel.cvut.cz/img/logo_cvut_40pix.png</mdui:Logo>
- </mdui:UIInfo>
- <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
- <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
- </eduidmd:RepublishRequest>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fel.cvut.cz/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fel.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fel.cvut.cz</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="cs">ČVUT FEL</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CTU FEE</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Ivan</md:GivenName>
- <md:SurName>Novakov</md:SurName>
- <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jíří</md:GivenName>
- <md:SurName>Cejp</md:SurName>
- <md:EmailAddress>cejp@fel.cvut.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..deefd7b9
--- /dev/null
+++ b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.jyu.fi/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Jyväskylä universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Jyväskyla</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Jyväskylän yliopisto</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
+biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
+LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
+b2dpbi5qeXUuZmkwHhcNMTMwNDA1MTEyOTQxWhcNMzMwMzMxMTEyOTQxWjCBpjEg
+MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2Eg
+ZmVkZXJhdGlvbiBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2Vy
+YWRtaW5Aanl1LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUw
+EwYDVQQDEwxsb2dpbi5qeXUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD8Y4Twul9N7kGDhz5oRwEYR4maD7hhDsipJvdQMYM5BTDTh3FGX4KvPFKx
+ytz1YVmtHwMmO/GVp0T1O+p9DDNE7AdyPGJieZlaOaYb6INKg1qNStJ3abmtTa1o
+ZtNFnCSsTl+POeCw4tLBU+EIqK6qHMtWaMJk3Kh66oFYwxhVLkvFQuLAFPp13NS3
+NQp6t6zNZOBEJoJ6WIRtz7YT0RPC0Q0jWK8dJErbcqoyWQXhKhelyOWVl4P+JsqA
+U0UkVh/suKfmm/0VhoqWybfbtXyW983eRbmF7im+5LedpL28vNYRjdYk/Y0jGGC0
+8hqR0kjed9s/V+HFHjpnajmnEfD9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIEO
+JdYZBrjvzJ4ytg8BqN4rggSSrKinsVdtQ1y9nEx/qpBP3W7PS40WkNdnKA+I2V/6
+zWTagYRZitwFvlinyxmetweYuSSSMlhlaJpGWz/fzJ6o+tDW5CVobSy2ijQen/SM
+QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
+lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
+ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
+OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.jyu.fi/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.jyu.fi/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.jyu.fi/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
+biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
+LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
+b2dpbi5qeXUuZmkwHhcNMTMwNDA1MTEyOTQxWhcNMzMwMzMxMTEyOTQxWjCBpjEg
+MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2Eg
+ZmVkZXJhdGlvbiBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2Vy
+YWRtaW5Aanl1LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUw
+EwYDVQQDEwxsb2dpbi5qeXUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD8Y4Twul9N7kGDhz5oRwEYR4maD7hhDsipJvdQMYM5BTDTh3FGX4KvPFKx
+ytz1YVmtHwMmO/GVp0T1O+p9DDNE7AdyPGJieZlaOaYb6INKg1qNStJ3abmtTa1o
+ZtNFnCSsTl+POeCw4tLBU+EIqK6qHMtWaMJk3Kh66oFYwxhVLkvFQuLAFPp13NS3
+NQp6t6zNZOBEJoJ6WIRtz7YT0RPC0Q0jWK8dJErbcqoyWQXhKhelyOWVl4P+JsqA
+U0UkVh/suKfmm/0VhoqWybfbtXyW983eRbmF7im+5LedpL28vNYRjdYk/Y0jGGC0
+8hqR0kjed9s/V+HFHjpnajmnEfD9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIEO
+JdYZBrjvzJ4ytg8BqN4rggSSrKinsVdtQ1y9nEx/qpBP3W7PS40WkNdnKA+I2V/6
+zWTagYRZitwFvlinyxmetweYuSSSMlhlaJpGWz/fzJ6o+tDW5CVobSy2ijQen/SM
+QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
+lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
+ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
+OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.jyu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.jyu.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Jyväskyla</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Jyväskylä universitet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Jyväskyla</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Jyväskylä universitet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.jyu.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.jyu.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.jyu.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Pasi</md:GivenName>
+ <md:SurName>Haapalo</md:SurName>
+ <md:EmailAddress>mailto:useradmin@jyu.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
index 54ec3b2f..a9036085 100644
--- a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
@@ -4,13 +4,18 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Uleåborgs universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Oulu</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
index 3b76145c..f968e90a 100644
--- a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
@@ -27,39 +27,26 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEdDCCA1ygAwIBAgIRAM7NnU7tUSvZo89k8bNlDzkwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTcwMDAwMDBaFw0xNjA0MTYyMzU5NTlaMEExITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbWVnc3ZsZS5s
- Ym9yby5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoGHlVk
- O6QB+0tuyJzq0vsd7NExlR42u6aWFPCfvujwV3om3gMN9ZjGqev6sY3xIVlg+ZOs
- I+1xKcIverLKiCbYtVnTxLBQI6zWybM8uK5AdTUC/BHpIA/fZqVkOajYzn002WFf
- u4rrUr0NZZszGm+RPSjdalhSf+BuUjm6Edn3TYB2PsEdtsyPEgETasdlZFgcdet+
- gYCkg6bTm7Hz7fUyj4q4iguswHzxj/p0N4STbtIJWPlFYJvgCLCHlcv+wrUXdl3u
- /W1uo6IK4xFHA88KA5iC0/WRcP0AZBoIIYt0m0WAfS5ESFVA9knCz3exQ2QW56rM
- w2JuyMdeIHaikQECAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBT7biuxyf6+GROU/N8IfMZmq4AQzDAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbWVnc3ZsZS5sYm9yby5h
- Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAeDFbLufu17MX88aTRPH2cLy2WRcPsvmS
- 1PGKkwJHRZXTg+MnviRJo9EhwPkjrolqCF6vmW//ksXqi/YO/3ot0zHW6EqrrAck
- 7RwNMtgBa/SP92iEYAzsEi76YeZupzlA5kRHwIVC9OJG/S/zSwSuxjHjDxPw4eGi
- +R7xcUcH1tUFYvS1VOVDyc3avo/QMa4TQhlK4g6ovUUFhINq1iX6P3ecBj7Z2GUg
- 69s/LbNH0HnpjKJnuLt3L94iQIWcehXxzOZ8OhZ7SExniAb3cB+9v5q6/Bt7Powx
- uIgZedCEHUiDOuVv71eq6ny67K+S91yR6wRAgV+vQo/hlnqZBHmccw==
+ MIIDADCCAeigAwIBAgIJAKmQG07LbtaqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
+ BAMTE21lZ3N2bGUubGJvcm8uYWMudWswHhcNMTYwNDA0MTExNTUyWhcNMzYwMzMw
+ MTExNTUyWjAeMRwwGgYDVQQDExNtZWdzdmxlLmxib3JvLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAptjXGVg/C5ZS9ERqejcesxpxi4uQhbUj
+ 1c4FUEAiENR7zsQkDYK8Vo8yDPpXgSNLMToJs8pKoeQz80LrwNzWm9XP4AX/nykM
+ 2I3M2PWvwyKwjyaIaygDbP9BTKgwTtkEdiwRaRN0uFJ+ltTuTwplgQOGOJoaA/HB
+ PuUHWKmPL3LWDe0aJQaF7H8YxixTfpxawCaUkAXAEuqWWWByCAertQDUln4vs9S4
+ +VXOAKOzpWL5hrMRdJjdy5y6YHVWg/Ma1RbLkSthu9hx6lvXCSQDJOzUXoZDy5Ji
+ sE4DrVPG4zOnuzl7weNExxrv13lSKSH9h1eMcVFoDUcKFSNaNEVqVQIDAQABo0Ew
+ PzAeBgNVHREEFzAVghNtZWdzdmxlLmxib3JvLmFjLnVrMB0GA1UdDgQWBBTCPyOF
+ UDxTQSUtw8+J6tsOJb49HDANBgkqhkiG9w0BAQsFAAOCAQEAEFYXAjJdWbzSf7cv
+ 8gNRMwSGPLy2azfxjzsBf+QybIi21BdEbknxkL6JijWn/gFADqmBFUxjZGn5j72O
+ L8NAY3VYPrHsS6xGMMxfZ/A5xzx71y1t22SxtaZW88u2tg3gXGP9s0NssgvXLMdG
+ 5MCMW8oZpJzoIcAQbTlTh8zsLov2bPFizopLrRN857Oj7C38XLwPa3LbLu6ZXz2K
+ ly7fE4j2AcivJSHoupjyFVRqWmdtkcMmCGuIlW6BL+CxFgPNCKAFWZxRRMXiuzIz
+ e6RNURI8NnCwzWQ39rJfK3ylKKvFkCKgdFqu1PgQ+Y6XaWM9lqM2EYfi3HYUVMbf
+ iqd+jw==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/SOAP"/>
diff --git a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index ead6de6c..00000000
--- a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oasp.test.openathens.net/oa/metadata">
- <!--
- This is an OpenAthens test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:55:47Z"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
- BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
- YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
- BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
- cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
- 7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
- yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
- jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
- jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
- dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
- RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
- mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
- HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
- dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
- hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
- /yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
- gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
- 6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
- LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
- GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
- BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
- YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
- BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
- cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
- 7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
- yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
- jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
- jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
- dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
- RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
- mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
- HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
- dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
- hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
- /yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
- gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
- 6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
- LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
- GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv: Test C SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index bd49a069..00000000
--- a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest1.test.openathens.net/oa/metadata">
- <!--
- This is an OpenAthens Support Test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:42:55Z"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
- /555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
- A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
- r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
- tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
- zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
- 2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
- GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
- mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
- Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
- ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
- FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
- UQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
- /555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
- A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
- r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
- tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
- zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
- 2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
- GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
- mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
- Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
- ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
- FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
- UQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP1</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index e2f2bd8d..00000000
--- a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest2.test.openathens.net/oa/metadata">
- <!--
- This is an OpenAthens Support Test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:50:35Z"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
- eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
- ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
- zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
- tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
- HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
- V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
- EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
- dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
- FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
- yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
- ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
- 6g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
- eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
- ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
- zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
- tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
- HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
- V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
- EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
- dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
- FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
- yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
- ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
- 6g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 8e4b52e7..00000000
--- a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.cesnet.cz/saml/sp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-19T21:13:48Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">OwnCloud</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">OwnCloud</mdui:DisplayName>
- <mdui:Description xml:lang="en">CESNETs servis for sharing files.</mdui:Description>
- <mdui:Description xml:lang="cs">Cesnetí služba pro sdílení souborů.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://owncloud.cesnet.cz/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="cs">http://owncloud.cesnet.cz/</mdui:InformationURL>
- </mdui:UIInfo>
- <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
- <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
- </eduidmd:RepublishRequest>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="9"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="10"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="11"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Lubos</md:GivenName>
- <md:SurName>Kopecky</md:SurName>
- <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
new file mode 100644
index 00000000..ed8aa550
--- /dev/null
+++ b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppms.eu/manchester/shibboleth">
+ <!--
+ This is a "PPMS for the University of Manchester" Shibboleth SP for Stratocore.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-07T12:23:18Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution for the University of Manchester</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC8TCCAdmgAwIBAgIJAPz0WtwkZDRdMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+ BAMTDmV1MS1zdHJhdG9jb3JlMB4XDTEzMDIyMDAyMTc0M1oXDTIzMDIxODAyMTc0
+ M1owGTEXMBUGA1UEAxMOZXUxLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
+ A4IBDwAwggEKAoIBAQDCYe74FvKADvVsBi9j+q8cpjOQBOu2IEbdgXBT+0UNiYFp
+ p9/gMt08fbGxcXDxzKBqZ9wvjnslhXgpFrZKbD3uY1I9sEiA1rqDYmplgMwZ4A8E
+ Ow+/qRqm5t4VQ0JOZzTYccgzelBQRyl5YMYqy0FauH5CEPMuQHFKSi3CO7LO4ucg
+ gIGZOEbjKl0BNhjKd8M6zQNsKk1KzYLxZ5YzU/1ETDs1J1cqIwqI/uq+dvfCVVeX
+ o+XrPad+t/8iwhmyTS5vio21kZK+biil/cOSwQaRhBTWclg3zHVVTtPap0ypZOeK
+ xiFrqWmmr9c1qOoaG6kFZtAFkCkepZb1ix+4eLzpAgMBAAGjPDA6MBkGA1UdEQQS
+ MBCCDmV1MS1zdHJhdG9jb3JlMB0GA1UdDgQWBBSEMJDeqFu+BPz5HcVjdtaJreHK
+ 3zANBgkqhkiG9w0BAQUFAAOCAQEAWnElDes0a9Fx5nP926lMbNUIhblAqziZPyvl
+ nyi1vh5zCQepefZGgFNM+8Pbi5x0059jyAnA6rfmwxNvkOtEK/qSLBLOyDpqwVbM
+ xQwQb6KUn5P28wdbbetRw1sxsYjNGmEs8RcisPyx4vK/cZnlLvGk/6b96LiCTeLV
+ C/wvGbXTcUyrTEniOO/54sVWnioRNxFz3lsa918j8CCFJbd+aM3q3fm7LPfbYIWW
+ q6YQKBzEpgV9ERLVaa1gEA1qYZaKrxjHp8G3T6wLpeKEiufCb59CPEbJkGOrXlWO
+ 7Qc3nJyR1cdsp5K2qqW6f14n97mp7yfKldJJX6NQJ7dUQ4TD/A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Stratocore</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://stratocore.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Stratocore Support</GivenName>
+ <EmailAddress>mailto:support@stratocore.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Mathieu</GivenName>
+ <SurName>Marchand</SurName>
+ <EmailAddress>mailto:hosting@stratocore.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
index 7ff0b164..d4ab16bd 100644
--- a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
@@ -38,8 +38,7 @@
<md:OrganizationURL xml:lang="en">http://www.deic.dk/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:Company>University of Patras</md:Company>
+ <md:EmailAddress>stathopou@ceid.upatras.gr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
index ed368ad4..cd0ba1bc 100644
--- a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
@@ -38,8 +38,7 @@
<md:OrganizationURL xml:lang="en">http://deic.dk</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:Company>PSNC</md:Company>
+ <md:EmailAddress>labedzki@man.poznan.pl</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.lynda.com.xml b/swamid-interfederations-2.0/saml.lynda.com.xml
new file mode 100644
index 00000000..0f61dbc1
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.lynda.com.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.lynda.com">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-06T14:42:49Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">lynda.com</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">lynda.com</mdui:DisplayName>
+ <mdui:Description xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</mdui:Description>
+ <mdui:Description xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://saml.lynda.com</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=https://saml.lynda.com</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAPS3fySJTyfaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmh0dHBzOi8vc2FtbC5seW5kYS5jb20wHhcNMTUxMDA1MTcxNTA0WhcNMTgx
+MDA0MTcxNTA0WjAhMR8wHQYDVQQDExZodHRwczovL3NhbWwubHluZGEuY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArljPwyk0t7fUrSYp7IcHBSI1
+29pQXs+eFnLUVvyXZ6X2ESoR1IC25P4ShlrmGHzkXrDY5RMDfZXxOlEQ3Z05gDHb
+LpDO+AxF1mzRZZjCP+XN1lgHeAue+14WRRQ4t55zsrnrwECBwj5A7PBat/8qVbqS
+eKJCfV21bKOeBD2g4nA9f1lJSMnoZ3tzOlysDg2oIbWbYqkX1NvalPO9smdtnsOk
+pb4RgGRx4f2iF5mg348n5s6napEid1578JI4QmEYdY+FMMpCK1xVwfconbKqP7BR
+WZh/JqpZjiem86Tv68LHReSIpySEnDQILDfvOi6n+OpiVwAnbnGrI4Q2OM3DpQID
+AQABo1wwWjA5BgNVHREEMjAwghZodHRwczovL3NhbWwubHluZGEuY29thhZodHRw
+czovL3NhbWwubHluZGEuY29tMB0GA1UdDgQWBBQuFJx7I6SR9oV6iuEqwJPd0mSE
+0jANBgkqhkiG9w0BAQUFAAOCAQEAq9XpSOuF67tPtTB+WKHegyYI0wZ3GoJxjYPz
+vEgv+LYSYutkDJG6M5HDkjtxn+SqIqBTr6AxGYdol8WPICgVAlj1LV36NHtE8TUi
+1gC7gzv/XxVPhLpEsyx2vcOgY/J5Nziu0epPg98GSvmplDG0Z6YuSa/zp7I1Z73r
+3Mu/W8FJJqoSZjil6BPnXv1dbjgOjg8Z7eQjqDwr2ki/td69pvvEyqIQ/0i/5C5w
+0k0LQi2tiJfdQN1LzTP/z7uglW9MXtsgWQgiY1fbMAU5PLdneI0GHwDUYbnizdk2
+YlDBz1PhAHejnP2Sx6tnjNQ36qgiwvybuEhFWs2/jSOM4SWhyg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.lynda.com/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml.lynda.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml.lynda.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">lynda.com</md:ServiceName>
+ <md:ServiceName xml:lang="en">lynda.com</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e484</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e484</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">lynda.com, Inc.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">lynda.com, Inc.</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.lynda.com</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.lynda.com</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Flynn</md:SurName>
+ <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Flynn</md:SurName>
+ <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
index 04390510..94fa2fae 100644
--- a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
@@ -54,11 +54,11 @@ vcW4oD4N2OIPcMam+7V1yw==
<md:OrganizationURL xml:lang="en">http://stevenson.edu/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Philip Desrosiers</md:GivenName>
- <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
+ <md:GivenName>Shibboleth Admin</md:GivenName>
+ <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Philip Desrosiers</md:GivenName>
- <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
+ <md:GivenName>Shibboleth Admin</md:GivenName>
+ <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
index d0ba98db..cdca3217 100644
--- a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
@@ -90,10 +90,6 @@ D0UPBA==
<md:OrganizationURL xml:lang="en">http://www.bucknell.edu/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Keelan Cleary</md:GivenName>
- <md:EmailAddress>cleary@bucknell.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
<md:GivenName>Michael Dahlberg</md:GivenName>
<md:EmailAddress>dahlberg@bucknell.edu</md:EmailAddress>
</md:ContactPerson>
diff --git a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
index 025f183d..c327f007 100644
--- a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
@@ -31,32 +31,36 @@
<mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
<mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</mdui:Logo>
</mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/Login" index="1"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/DS" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/DS" index="2"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/Login"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/UKfedWAYF"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/UKfedWAYF" index="3"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJALYvWF0HTg94MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFHNoaWIuaW5mb3JtaXQuY29tLmF1MB4XDTEzMDYwNjAxMzMzMFoXDTIzMDYw
- NDAxMzMzMFowHzEdMBsGA1UEAxMUc2hpYi5pbmZvcm1pdC5jb20uYXUwggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQConFnj3K7sHy3Xa8iyPuW3NSYl9H8L
- 1yUYum0MvgrMtxSn+hhrRQZS9Ub1E+7BLjsdBfmnDVsL8i+nCmTtWuDhINSeCPhh
- RVF4pJ6zl6OFRc0k4X5JhTF7hfqKMmvALAUzMvRRb/Q6YmRFdsZq6cdyZxZaMKUN
- CWwjsFHD9Tg4bF6s+OVdnSqpTJE518wzl8LxklkSeo/xjWoBezA11t8/E5HKFqv3
- Djwvd5cF8Pt5Cyxp8wz8oacyzamQFhWcn2XQcaSUh8vodNCFtFxvPXl1mcZGY+kq
- iCyT91pSxSFasliWoJaY839DmqaqYZtPN92lYMmDLeNYEX0hBczBxztTAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFHNoaWIuaW5mb3JtaXQuY29tLmF1MB0GA1UdDgQWBBT2
- l+da01RVVegnzL4KMKKI9W79cTANBgkqhkiG9w0BAQUFAAOCAQEAKZyhvO7eDK57
- xQ2STBOYKOJC9yEpH2CmNhkshIgvTN3S2yYfz1jjtTAxCke/2FyO3BIJCGgDeXG/
- MdL9DTmblscFdhyAqvw/Y4IZMVPePrvOna8CmdsSXxV1V1B+YO6q8qlWQ/19Aqs8
- yfoTBDA3DSXYPqfYN2Q44J9B45tSdfr5Et3bcISdusu6aXnxwfpm2S9SZ9fkQCSM
- oT3Pa2/yXfxkvLyszNsiSjV7p30I6qpIOELLILYxN881SGs0Xi0GPhw9LtGJT6wY
- /HUOp21fktmi6T1RRosh/kjF69hpNeY1qnoobw4stsDRi36AybFABgv0wxFk/4PL
- t2UA+9z1qA==
+ MIIDEjCCAfqgAwIBAgIJAMJQ7W9dNntWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+ BAMTGXNoaWJwcmR3czAxLnJtaXQuaW50ZXJuYWwwHhcNMTYwMjE1MjMwNjM0WhcN
+ MjYwMjEyMjMwNjM0WjAkMSIwIAYDVQQDExlzaGlicHJkd3MwMS5ybWl0LmludGVy
+ bmFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsl8OCJqga3lb7Nw6
+ XgS5YrzMz7HOZKQ5FtuveFyESrQ2YkmJm4NVxXYQ74ahdYpKfjT/I7aSY5Fo0Zfs
+ RQ08ZhXLppQSaOBkPkfGzZJFAoGo5jZUzS29INjPo/vutRd787CfUwSVM/fG7CBH
+ y6LK5+yU4NaxfPu7cgXyLdT9id9vXCanktDf+8MwBcHAQDW1mDw1eqqhED6+50zS
+ p7HlZjcHlJ4O8CBmi/STrLNNIChFFYFWWhfq0dNBas4br5ro8bSmFNPXpkoK17t3
+ CM2IVKvQOnRpSy/xuun7w7uTpB3bVBiWYO5l8hZ06PDiLaGujiebV23jL35DrtGl
+ EAUvbQIDAQABo0cwRTAkBgNVHREEHTAbghlzaGlicHJkd3MwMS5ybWl0LmludGVy
+ bmFsMB0GA1UdDgQWBBT0PhB6XxNLt7dLIwr0nlxbJ9z72DANBgkqhkiG9w0BAQUF
+ AAOCAQEAdN5GfXlrkG1x4ygh1/ZwBtNgQPiaWCIBTNVSLBZCLZYU3FFPZoK26W3U
+ qj8db4lHSlm46ExSmYR4mPsFUfqmRAD6yQwVFLGll4J88Mt7iVu6M9kyBxhQJ7X/
+ UfJhnRxzYLyoDtLjp3ayynkE36f7KRnlVeukYminUnlURyW0+RR5FVgv2WBn3RRk
+ Nmi1/D0NwnlH72Pj+hfblBuhfF1eWlYWEAdC+t9LUCU32Ocox0GP8WNNDz5x41Yt
+ EKhu2M87LgaVdkNX7Byh25ha8ELXFBxMcv/uMmImAT53C9rd/4UTLaHQffFVDD1C
+ jMB14stpA71j1X9hdeFzaL/T/NYkww==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -75,10 +79,6 @@
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Artifact"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
@@ -96,8 +96,13 @@
<EmailAddress>mailto:support@rmitpublishing.com.au</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Deepak</GivenName>
- <SurName>Vasa</SurName>
- <EmailAddress>mailto:deepak.vasa@rmit.edu.au</EmailAddress>
+ <GivenName>Dominic</GivenName>
+ <SurName>Crowther</SurName>
+ <EmailAddress>mailto:dominic.crowther@rmit.edu.au</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Loan</GivenName>
+ <SurName>Pham</SurName>
+ <EmailAddress>mailto:dominic.crowther@rmit.edu.au</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
deleted file mode 100644
index f7d2019d..00000000
--- a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.its.fsu.edu/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsu.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Florida State University</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.its.fsu.edu/idp/profile/SAML2/POST/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsu.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Florida State University</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Florida State University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.fsu.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Chuck Kemeny</md:GivenName>
- <md:EmailAddress>ckemeny@admin.fsu.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Diane Higgins</md:GivenName>
- <md:EmailAddress>dhiggins@fsu.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Jonathan Liedy</md:GivenName>
- <md:EmailAddress>jliedy@fsu.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
deleted file mode 100644
index aff8ea0a..00000000
--- a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.lternet.edu/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lternet.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</mdui:DisplayName>
- <mdui:Description xml:lang="en">The U.S. LTER Network is an National Science Funded project that includes 26 research sites encompasing a wide range of ecosystem types spanning broad ranges of environmental conditions and human domination of the landscape. The geographic distribution of sites ranges from Alaska to Antarctica and from the Caribbean to French Polynesia and includes agricultural lands, alpine tundra, barrier islands, coastal lagoons, cold and hot deserts, coral reefs, estuaries, forests, freshwater wetlands, grasslands, kelp forests, lakes, open ocean, savannas, streams, and urban landscapes.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.lternet.edu</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lternet.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.lternet.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lternet.edu/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lternet.edu/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lternet.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.lternet.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Mark Servilla</md:GivenName>
- <md:EmailAddress>servilla@lternet.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
index 453cf9aa..3a4d2b31 100644
--- a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.oclc.org/shibboleth">
<!--
- This is a service provider for OCLC (UK) Limited.
- Uses 1.3 of the Shib SP, and a home-brew WAYF
- written in Java using Tomcat as a servlet container.
+ This is an "OCLC FirstSearch" Shibboleth SP for OCLC (UK) Limited.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
diff --git a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
index ecfec44d..f7a52a3d 100644
--- a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
@@ -18,7 +18,7 @@
<mdui:DisplayName xml:lang="en">University of Nebraska-Lincoln</mdui:DisplayName>
<mdui:Description xml:lang="en">The University of Nebraska-Lincoln, chartered in 1869, is an educational institution of international stature. UNL is listed by the Carnegie Foundation within the "Research Universities (very high research activity)" category. UNL is a land-grant university and a member of the Association of Public and Land-grant Universities (APLU). The university is accredited by the Higher Learning Commission of the North Central Association of Colleges and Schools.</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.unl.edu/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.unl.edu/is/about/UNLprivacy.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://its.unl.edu/unlprivacypolicy</mdui:PrivacyStatementURL>
<mdui:Logo height="67" width="66" xml:lang="en">https://idm.unl.edu/wdn/templates_3.0/images/logo.png</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
@@ -47,45 +47,11 @@ D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unl.edu/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unl.edu/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unl.edu/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unl.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVALR4hUzlhDFUyPrCzbCR8aB8/okIMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTAeFw0xMDA5MTAyMTA4MjZaFw0z
-MDA5MTAyMTA4MjZaMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJhLs+N32LNQicvVL26oZcWyU46MixkhDOdG
-h5XmzO8vWckrIPs+4LUG5U9ozfIksiYVVJW4mTl21RID0RJ9l3svZeKvEKBGrxUR
-6mQb1nQQcUPVVxNlMIZ5rlWfyffWcP686kGYTdWMU14KyflrVyFW7Vq70izKe9oT
-nX+bEclWv6KjzFayWJcIYCE4+jX7GvxSMyQTh3TRenUGOh9iukzIHlApI9bfzh89
-OdHsHy3WPmvoZYRTLeeTtG+qvzNvD+IMBNCUM9f8bRYc6N790/vBHn7kU5XSiMIv
-5sXFMt5nwNPDq3+37vY7xpu+r74tcT3HpXF5OeOPmG2OC8FSIvMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51bmwuZWR1hiNodHRwczovL3NoaWIudW5sLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTEOLq42EOS0daP8iT0PJ1kc4rMUwDQYJ
-KoZIhvcNAQEFBQADggEBAIAZpYEcXhU317hPR08os2NC3TM2K6BaNrRm53fu+tIT
-zsdHv7cfQ7ONLUE5vC0Wis6g468wGOKi01ueSrIU7emQUgQaxRoCbinUsSu1R6a1
-NP/c0ZhOo88hweNRac8zpZccjUi9Oc3WssQ/uHbkumN2hM7BhvC/4NRg5NRMWLNs
-ko224ENGUqVqFkBiZJWH5ooxOM/8Gt4Ut1cTkNxyMSJvno7Gki95l0M45fNfSbWw
-voZFOzm0IBZx1K786PNxotISs/WY/R7yJA91L0FCzrXFMh+jK5L1nCg5ZfEL0YEM
-D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationDisplayName>
@@ -103,4 +69,8 @@ D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
<md:GivenName>Brett Bieber</md:GivenName>
<md:EmailAddress>bieber@unl.edu</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+ <md:GivenName>UNL Security Team</md:GivenName>
+ <md:EmailAddress>security@unl.edu</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
deleted file mode 100644
index af5ee162..00000000
--- a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.rowan.edu/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor errorURL="https://shib2.rowan.edu" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Rowan University</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.rowan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.rowan.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.rowan.edu/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.rowan.edu/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Rowan University</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Rowan University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.rowan.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Josh Grochowski</md:GivenName>
- <md:EmailAddress>grochowski@rowan.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index c03e8446..00000000
--- a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.to.cnr.it/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceris.cnr.it</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CNR IRCrES</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">CNR IRCrES</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for CNR IRCrES users</mdui:Description>
- <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR IRCrES</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- <mdui:Logo height="60" width="80" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
- <mdui:Logo height="60" width="80" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
- <mdui:Logo height="16" width="16" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
- <mdui:Logo height="16" width="16" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
-d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
-kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
-HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
-VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
-e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
-EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
-ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
-DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
-6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
-XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
-75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
-xLAyzTVSpamrag76ZF4Qye/ENGU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.to.cnr.it/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.to.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceris.cnr.it</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
-d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
-kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
-HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
-VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
-e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
-EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
-ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
-DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
-6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
-XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
-75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
-xLAyzTVSpamrag76ZF4Qye/ENGU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
- <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="it">CNR IRCrES</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CNR IRCrES</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="it">http://www.ircres.cnr.it/index.php/it/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.ircres.cnr.it/index.php/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Giancarlo Birello</md:SurName>
- <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:supporto@to.cnr.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
index 745cc7a6..159de9fd 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
@@ -64,6 +64,50 @@ yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
+bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
+cmcuZGUwHhcNMTYwNDEyMDgxMDU4WhcNMTkwNzA5MjM1OTAwWjCBmDELMAkGA1UE
+BhMCREUxDzANBgNVBAgMBkJheWVybjETMBEGA1UEBwwKUmVnZW5zYnVyZzEgMB4G
+A1UECgwXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsMDVJlY2hlbnpl
+bnRydW0xKTAnBgNVBAMMIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7i+RKUaVAruh38IbGPaR
+3bXZ5ATX8ITFmnyXb7jiGUSumDGFP6WB8KYG5DBOj7IJg8XTcjB+VoHk5OB4O5Rd
+/O/XO66FGWl46yufdzeI3GAVNLN2pqtgbzufOIuIFs/8Ggx7VZJOuuhchgNRCnnP
+o5G7Ba21+y7TRCdVZZ6/xAahJreEmJDn6BWXbDS0X2rkfqHCk8ah/dz7fCJtwNF4
+wrJMnJRKF4dEmaS+gP44B04SXO4vGlNQ/wuWaWXvDRAHqJewm0RRJgwhJIy/WnPA
+cvGhm1KZPyPOVy53ndH1AHdIGRxCMg7giDQhwRnvyvMKuDfNdiXOLdrO39fyo5J3
+BwIDAQABo4ICxDCCAsAwWQYDVR0gBFIwUDARBg8rBgEEAYGtIYIsAQEEAwQwEQYP
+KwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4w
+CAYGZ4EMAQICMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOOi2L5LoOzpQGSjEMHoYo2cfS/zAfBgNVHSME
+GDAWgBQH1915iF9BccwW4dTH852yeLHdSDCBgAYDVR0RBHkwd4Ikc2hpYmJvbGV0
+aC1pZHAuYWRzLnVuaS1yZWdlbnNidXJnLmRlghdzaGliYm9sZXRoLWlkcC51bmkt
+ci5kZYIgc2hpYmJvbGV0aC1pZHAudW5pLXJlZ2Vuc2J1cmcuZGWCFHNoaWJib2xl
+dGgtaWRwLnVyLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBj
+YS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+
+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhido
+dHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQsFAAOCAQEACrNp0LBp5RdEQ1kmAaxnY2ar+qhNbbD2b+qrSO47
+wgQJZzeKtO12SzMUNIJT/s2C4DN9Irc7YLrRX/pxneQ2Q4g8WhZb2qed3KdrQ5Om
+IJ3yaR8BMHUpeDQL5apE4jU18oKhlfFfaFcSajxad23L4HaFeQGbEtgpvAfhYeee
+m+fqaz3DlgdHL0vWjipIzOzODRo9R0t6OWnSFv5Yec6b4dZg3iSkf+pQavM7jGAi
+DX4hNvuSdqAQoshPOGkne5JWS+LZI7JffpNn+mWxdPb51iMUKTctcR/LGRPqQi5L
+p+8JChZ2pTZka2I2LRNae9c55NrpAChzn1jXzXtjCS8T5w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..abef3425
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cant-col.ac.uk/idp/shibboleth">
+ <!--
+ This is a "test" Shibboleth IdP for Canterbury College.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-04T14:23:04Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Logo height="274" width="88">https://shibboleth.cant-col.ac.uk/canterbury-college-logo.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-icon.png</mdui:Logo>
+ <mdui:Logo height="80" width="60">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-cds.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">Canterbury College (test)</mdui:DisplayName>
+ </mdui:UIInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+ VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
+ EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
+ IjAgBgNVBAMMGXNoaWJib2xldGguY2FudC1jb2wuYWMudWsxIDAeBgkqhkiG9w0B
+ CQEWEW5zQGNhbnQtY29sLmFjLnVrMB4XDTE2MDMyNDEwMDc0MloXDTIxMDMyMzEw
+ MDc0MlowgbAxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIDARLZW50MRMwEQYDVQQHDApD
+ YW50ZXJidXJ5MRswGQYDVQQKDBJDYW50ZXJidXJ5IENvbGxlZ2UxGjAYBgNVBAsM
+ EUNvbXB1dGluZyBTdXBwb3J0MSIwIAYDVQQDDBlzaGliYm9sZXRoLmNhbnQtY29s
+ LmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFuc0BjYW50LWNvbC5hYy51azCCASIwDQYJ
+ KoZIhvcNAQEBBQADggEPADCCAQoCggEBANL1WfdbMgBzfEOxwHeSK+MDNURlQWyV
+ aNSsn1KqEd13v+Ja/YwUyM0htgC95qFrRD2X2J6Vx1I8qTHJgyTr8nCz9iImV1uG
+ emG/skA2IKmkMVyfCX5DxQcmmiShm1b+cNW1fuJSxexUpUlHysJDMUeZnKIHUpug
+ qCabMwY7KmSMmcvT4+tn86Hh2xi2fDK/9stbiNo+5CAC8LA7FDQeQDiQaQyBmF6o
+ A5cSOq7/WA2lb+r/7LTznxWf3E4wCEQW3oaShETf9wJjC/wd0gFoyWKRz101xqW5
+ MqC8PgS4zcOkQuEIFTGPyAwnNYxKr67pqxsJIo+Ynq5TOUm4JHQJ6LcCAwEAATAN
+ BgkqhkiG9w0BAQUFAAOCAQEALKs+qNF+Z35LBada4feOxHMLiGq3qBLh4ULKzPrt
+ D5u4Xp1+4PGHWGkq5umdasnHcDH77T0jzFRCg3dGp6ZLF67SJjtPBC2Fg6n3QtGM
+ AvKTJHXQ4YOljSjVyXFtJjCJ4BLLBvld1WPWnJcI6d+hOM2AoWTGGIcZULxZjkk3
+ Vnfieg8hEskAqp9Ausr7zqgibczT83qM/JPTJmE4HygbhlE7AC8G3plV1Xx4Zdmq
+ U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
+ eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+ VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
+ EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
+ IjAgBgNVBAMMGXNoaWJib2xldGguY2FudC1jb2wuYWMudWsxIDAeBgkqhkiG9w0B
+ CQEWEW5zQGNhbnQtY29sLmFjLnVrMB4XDTE2MDMyNDEwMDc0MloXDTIxMDMyMzEw
+ MDc0MlowgbAxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIDARLZW50MRMwEQYDVQQHDApD
+ YW50ZXJidXJ5MRswGQYDVQQKDBJDYW50ZXJidXJ5IENvbGxlZ2UxGjAYBgNVBAsM
+ EUNvbXB1dGluZyBTdXBwb3J0MSIwIAYDVQQDDBlzaGliYm9sZXRoLmNhbnQtY29s
+ LmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFuc0BjYW50LWNvbC5hYy51azCCASIwDQYJ
+ KoZIhvcNAQEBBQADggEPADCCAQoCggEBANL1WfdbMgBzfEOxwHeSK+MDNURlQWyV
+ aNSsn1KqEd13v+Ja/YwUyM0htgC95qFrRD2X2J6Vx1I8qTHJgyTr8nCz9iImV1uG
+ emG/skA2IKmkMVyfCX5DxQcmmiShm1b+cNW1fuJSxexUpUlHysJDMUeZnKIHUpug
+ qCabMwY7KmSMmcvT4+tn86Hh2xi2fDK/9stbiNo+5CAC8LA7FDQeQDiQaQyBmF6o
+ A5cSOq7/WA2lb+r/7LTznxWf3E4wCEQW3oaShETf9wJjC/wd0gFoyWKRz101xqW5
+ MqC8PgS4zcOkQuEIFTGPyAwnNYxKr67pqxsJIo+Ynq5TOUm4JHQJ6LcCAwEAATAN
+ BgkqhkiG9w0BAQUFAAOCAQEALKs+qNF+Z35LBada4feOxHMLiGq3qBLh4ULKzPrt
+ D5u4Xp1+4PGHWGkq5umdasnHcDH77T0jzFRCg3dGp6ZLF67SJjtPBC2Fg6n3QtGM
+ AvKTJHXQ4YOljSjVyXFtJjCJ4BLLBvld1WPWnJcI6d+hOM2AoWTGGIcZULxZjkk3
+ Vnfieg8hEskAqp9Ausr7zqgibczT83qM/JPTJmE4HygbhlE7AC8G3plV1Xx4Zdmq
+ U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
+ eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Canterbury College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Canterbury College (test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Nathan</GivenName>
+ <SurName>Friend</SurName>
+ <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Nathan</GivenName>
+ <SurName>Friend</SurName>
+ <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
deleted file mode 100644
index fb25dc38..00000000
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.crous-poitiers.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T15:55:18Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CROUS Poitiers - Etudiants</mdui:DisplayName>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
- <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
- <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Etudiants</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDWzCCAkOgAwIBAgIUMWKZ8/6tKA7kwdsn4f4/cqyDED0wDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcc2hpYmJvbGV0aC5jcm91cy1wb2l0aWVycy5mcjAeFw0x
-MDA2MTAxMzMyNTNaFw0zMDA2MTAxMzMyNTNaMCcxJTAjBgNVBAMTHHNoaWJib2xl
-dGguY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCax6s86p49Xf1m/noYZtAqbN3LTSLj2rpuCe9jcMM9Gpf4X6p0btKZtWVq
-PMyJ+1oytarshKxBGV7m1U3MkZu88/Bn1OykynsaPPFYCraOWIawJRFJL2t45/By
-K7LVjmahS2JJj5qfVNuFNL4MsrfNieEZjZHdE/B9FZR4ME5sxwH44WvHEOnmumO7
-l6GY8pHrWp8e0HDXf8Y1gn3dj4u0tNs5GBDVygqXgPKsSRi8IHAHKxbNuWx+PDWZ
-m25S2ouiGO27vkIYYPWvFjyxNqe0KFVD6yVYVoWdHFM7rskYJqE+iinmLpgE+tZX
-Q2oMnhEZlFeUiSzKq21Pi07JAwfHAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNoaWJi
-b2xldGguY3JvdXMtcG9pdGllcnMuZnKGM2h0dHBzOi8vc2hpYmJvbGV0aC5jcm91
-cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhXma4CxtS0tm
-sfkbl1uusiIUhq8wDQYJKoZIhvcNAQEFBQADggEBAGzVwbgJ/j2DYjRc8NR7NnDG
-1FAueaBwSVOPe/zawt1M/nNhyHeIAXzsMaLLTptJmXSI1NYH8Zf0ZePlTj34W+iM
-MMYtACZXOqn9MROynG9sUKwh3qTe+yrskUoemApa/WndPY3mlEmoee5v7mJnD70Q
-asxkqS76pkUhyQAUBIZs2XwAdKamI/Fo3kfiOI/3GAFjQObwwnsg9fQLGq/jO8gK
-n44H8PXS4Vf4LLnN8kOUlNvmDD0us5c73Gli/rg/cKTptN1l+TbZ97qBqjTofxPa
-uPReZV8LGAFTW7W5OYm6HcXR3TA/vVBHjBqTmNFZ7/8t8dmgZ5uNGJNLsSgBhg8=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
index 276a2853..c755e49f 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
@@ -52,11 +52,6 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
<md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Christophe DEROUET</md:SurName>
- <md:EmailAddress>christophe.derouet@insa-cvl.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Sylvain LESAGE</md:SurName>
- <md:EmailAddress>sylvain.lesage@insa-cvl.fr</md:EmailAddress>
+ <md:EmailAddress>service-info@listes.insa-cvl.fr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
deleted file mode 100644
index 8c6de095..00000000
--- a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.medvik.cz/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-16T11:08:52Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">medvik.cz</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">National Medical Library, Prague - Medvik</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for users of Medvik system.</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro uživatele systému Medvik.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.nlk.cz/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="cs">http://www.nlk.cz/</mdui:InformationURL>
- <mdui:Logo height="75" width="108">https://www.medvik.cz/images/medvik-logo.png</mdui:Logo>
- </mdui:UIInfo>
- <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
- <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
- </eduidmd:RepublishRequest>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.medvik.cz/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">medvik.cz</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">National Medical Library</md:OrganizationName>
- <md:OrganizationName xml:lang="cs">Národní lékařská knihovna</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.nlk.cz/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="cs">http://www.nlk.cz/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Filip</md:GivenName>
- <md:SurName>Kriz</md:SurName>
- <md:EmailAddress>medvik@nlk.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
deleted file mode 100644
index ae4c9509..00000000
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.reitoria.unesp.br/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="pt-br">
- http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
- </mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">UNESP - Univ Estadual Paulista</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:DisplayName>
- <mdui:Description xml:lang="en">UNESP - Univ Estadual Paulista</mdui:Description>
- <mdui:Description xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.unesp.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br/</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
-MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
-bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
-uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
-HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
-VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
-E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
-jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
-WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
-bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
-/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
-KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
-MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
-bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
-uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
-HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
-VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
-E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
-jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
-WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
-bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
-/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
-KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">UNESP - Univ Estadual Paulista</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.unesp.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.unesp.br/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Carlos Coletti</md:SurName>
- <md:EmailAddress>grc@unesp.br</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index cb97e1d8..00000000
--- a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.to.cnr.it/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivv.cnr.it</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CNR IPSP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">CNR IPSP</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for CNR IPSP Turin users</mdui:Description>
- <mdui:Description xml:lang="it">Identity Provider per gli utenti di Torino del CNR IPSP</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
-Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
-dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
-fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
-uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
-5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
-iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
-/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
-nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
-XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
-cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
-HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
-MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.to.cnr.it/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivv.cnr.it</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
-Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
-dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
-fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
-uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
-5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
-iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
-/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
-nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
-XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
-cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
-HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
-MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
- <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="it">CNR IPSP</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CNR IPSP</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="it">http://www.ipsp.cnr.it/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.ipsp.cnr.it/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Giancarlo Birello</md:SurName>
- <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:supporto@to.cnr.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml b/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
deleted file mode 100644
index fdfdc884..00000000
--- a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.test.openathens.net/shibboleth">
- <!--
- This is a Test Shibboleth SP for Eduserv.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-19T09:15:34Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibsp.test.openathens.net/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAIk7Iq11rRt9MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGnNoaWJzcC50ZXN0Lm9wZW5hdGhlbnMubmV0MB4XDTEyMTAxNzE0NDA0NFoX
- DTIyMTAxNTE0NDA0NFowJTEjMCEGA1UEAxMac2hpYnNwLnRlc3Qub3BlbmF0aGVu
- cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGWHhxgjISM46
- 9b3A8gkGUa2ylMd+Ubx/41jPo8a9F0edLOfcJRrJz3yXz4fyqkfO7kINyQzN3mv3
- CsLOu3SfYfS+oPlQV0UjRrwCJooGZgSYRCl1XzSesRUWUw6S42kc39z10KEKfC4o
- 8o3yvsef+OAMB6GpvY3JeiqzN8iSKZFRwr9hAA670YVs3PaGJtKcsGTIidX6PbXl
- s7P9z6mnysxOLMVaPOFmo0poCLgEAmAg/8nIYd19sHJbT4Zp0rhLG31Re4P9b8IU
- 3YEUsNFlSQ7/9n69rYlthriKBq+Lu8dPfG8oHrBKmqmeDYAdHla5J00lCEJX6pjP
- +F4a7x7rAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJzcC50ZXN0Lm9wZW5hdGhl
- bnMubmV0MB0GA1UdDgQWBBSNL+bmIEoGpOitytkAJWqzqQVexzANBgkqhkiG9w0B
- AQUFAAOCAQEAh6YPN9WA+ie41e+xTwepOMsupMgdJAvO3Pj2GqTRV7ub8oYHsNPz
- e4hnUgy3PgWZUprg2Xu0dR80UaCt76RZktkywhE5Ese6gRzCnw5naeq+BohzZYhT
- 3aQqYN/3seBxz7q2ykidNM/FAuK0wzoS4kekkValdz58KNlqM5dFWyahc8nHN+3Q
- PbHhdrEP/5L39XmhM1jCI3DUOL0FupAeosuYPOSfA7eTha7pPKc4hbdPrBWDumBz
- 49zWCVrzQN0i1CSS9gy9YBiqjnns9/ziNp6qb1VX2BIJ9Po6llnGAYOR6DLLgcYQ
- 3+F3/x57N94upwLaCaoj+04/l3acLW3ylQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv Test Shibboleth SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 92d123bb..19213382 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -7,9 +7,9 @@
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
index 0b38d21e..ce2b2011 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Agcensus</mdui:DisplayName>
<mdui:Description xml:lang="en">Grid square agricultural census data for England, Scotland and Wales</mdui:Description>
- <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
+ <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
index 44731f18..ab3c7aaa 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
@@ -14,7 +14,7 @@
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/UKDA"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/EDINASchools"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKFederation"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Digimap for Colleges</mdui:DisplayName>
<mdui:Description xml:lang="en">EDINA Digimap for Colleges</mdui:Description>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
index 459cf0d0..cc8cd9e2 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
@@ -16,7 +16,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">EDINA M2M Authentication</mdui:DisplayName>
<mdui:Description xml:lang="en">EDINA M2M Authentication</mdui:Description>
- <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+ <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
index 66955fb4..4143334b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">JISC MediaHub</mdui:DisplayName>
<mdui:Description xml:lang="en">The definitive academic video, image &amp; audio resource</mdui:Description>
- <mdui:Logo height="84" width="350">https://vsp2.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
+ <mdui:Logo height="84" width="350">https://auth.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
index 71a3c272..62d28ff8 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
@@ -16,7 +16,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">SafeNet</mdui:DisplayName>
<mdui:Description xml:lang="en">SafeNet</mdui:Description>
- <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+ <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
index 8768ef58..8ad7ae10 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">UKBORDERS</mdui:DisplayName>
<mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
- <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
+ <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
index 3547693a..f4069146 100644
--- a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">GeoDoc</mdui:DisplayName>
<mdui:Description xml:lang="en">A metadata creation and management tool</mdui:Description>
- <mdui:Logo height="100" width="350">https://vsp2.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
+ <mdui:Logo height="100" width="350">https://auth.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
index 85b7a5a0..8c70b7d5 100644
--- a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
+++ b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
@@ -4,6 +4,11 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -11,11 +16,11 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
<mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
- <mdui:Logo height="80" width="170">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logo_RGB_2000dpi.png</mdui:Logo>
- <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
+ <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
+ <mdui:Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Language Bank, Portal, discussion forum</mdui:Keywords>
+ <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
<mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
@@ -68,11 +73,12 @@ ukUJvoKA4qzHcF2rQn4=</ds:X509Certificate>
<md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
<md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
index a50f04b9..3fb784c1 100644
--- a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
@@ -56,38 +56,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
- ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
- 7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
- VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
- ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
- 3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
- ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
- ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
- oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
- BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
- LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
- BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
- Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
- DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
- Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
- 700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
- WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
- RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
- zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -147,38 +115,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
- ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
- 7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
- VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
- ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
- 3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
- ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
- ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
- oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
- BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
- LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
- BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
- Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
- DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
- Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
- 700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
- WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
- RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
- zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -190,9 +126,9 @@
<OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Leslie-Ann</GivenName>
- <SurName>Campbell</SurName>
- <EmailAddress>mailto:l.campbell@kcc.ac.uk</EmailAddress>
+ <GivenName>Tony</GivenName>
+ <SurName>Jack</SurName>
+ <EmailAddress>mailto:t.jack@kcc.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Richard</GivenName>
diff --git a/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..c4531c53
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.bl.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for The British Library.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-08T10:16:08Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">British Library</mdui:DisplayName>
+ <mdui:Logo height="100" width="52">https://www.bl.uk/britishlibrary/resources/global/images/bl_logo_100.gif</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://www.bl.uk/britishlibrary/resources/global/images/favicon.ico</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDEDCCAfigAwIBAgIVALBlb0xD9RVnJc/iRBgGkyuuv6vzMA0GCSqGSIb3DQEB
+ BQUAMBQxEjAQBgNVBAMMCXNzby5ibC51azAeFw0xNTExMjUxNjA4MDZaFw0zNTEx
+ MjUxNjA4MDZaMBQxEjAQBgNVBAMMCXNzby5ibC51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBALV1sBlNUZVsWVfQI38jlRlndRGuKVJkbKv0LAXkuCRW
+ 1yVfVzC481huMNTDX+3CYb1lkM9IpA3EQnK0PFB79ADvtlQuTAeLZnbHnSuNXtoO
+ Uw3klvdKWjUjB4QC6FI8XS9oYiBwnogW8IH8O40CAAJLgbFuyqeLkFGS4BBk5hKf
+ 3Q42eq2So0K4piamfZbMlhdwB1Eovd5YyAN8qISTiDKlEd+BL8ZnB2dvHliSf7BV
+ SP9nxptQ9ncooTErBJhycTQhIB7OlBXPPD9/emJqlVm8njxGHCqufYI6oHSQdg2Z
+ /+4lx2cRrpDKr7ROb/5W9gZBCXYDlUQhHYl2GOa7MRUCAwEAAaNZMFcwHQYDVR0O
+ BBYEFIHLjm+wCv758W1MN5NooNkCbsM3MDYGA1UdEQQvMC2CCXNzby5ibC51a4Yg
+ aHR0cHM6Ly9zc28uYmwudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
+ ggEBAAdklLJrCnZ7a42MWalgiF3Jxch554vKu672us0vIbC4YHOFg3znXGFMQN6s
+ XgfQfwGZvvNvzf2SGvH8p20jjcn/WVKnTNtAUgRT/KQHnAktoASFoLHNY/x+HsWT
+ /wHJw9Sr+eEFPet9lYN9JJu0U8sSC1NKf+kjRcJG7K/6kABscqRVTOJ8fVZzKoz/
+ wUBZw8uhw9U8kad0nyga7JCTMMqX5RvveFIAtnkK77XpJ1vm95VE1Udh03uXUvtN
+ j4nMh5rBX6K6S1rOl7AkRyUW+Nv7ayWjWiU+ASMxnOeo7nfg1xHKLLTf4dUB23ot
+ onq0e4aCSYwqgr4fh8WX2L9+Ncc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bl.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bl.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bl.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.bl.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bl.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.bl.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bl.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDEDCCAfigAwIBAgIVALBlb0xD9RVnJc/iRBgGkyuuv6vzMA0GCSqGSIb3DQEB
+ BQUAMBQxEjAQBgNVBAMMCXNzby5ibC51azAeFw0xNTExMjUxNjA4MDZaFw0zNTEx
+ MjUxNjA4MDZaMBQxEjAQBgNVBAMMCXNzby5ibC51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBALV1sBlNUZVsWVfQI38jlRlndRGuKVJkbKv0LAXkuCRW
+ 1yVfVzC481huMNTDX+3CYb1lkM9IpA3EQnK0PFB79ADvtlQuTAeLZnbHnSuNXtoO
+ Uw3klvdKWjUjB4QC6FI8XS9oYiBwnogW8IH8O40CAAJLgbFuyqeLkFGS4BBk5hKf
+ 3Q42eq2So0K4piamfZbMlhdwB1Eovd5YyAN8qISTiDKlEd+BL8ZnB2dvHliSf7BV
+ SP9nxptQ9ncooTErBJhycTQhIB7OlBXPPD9/emJqlVm8njxGHCqufYI6oHSQdg2Z
+ /+4lx2cRrpDKr7ROb/5W9gZBCXYDlUQhHYl2GOa7MRUCAwEAAaNZMFcwHQYDVR0O
+ BBYEFIHLjm+wCv758W1MN5NooNkCbsM3MDYGA1UdEQQvMC2CCXNzby5ibC51a4Yg
+ aHR0cHM6Ly9zc28uYmwudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
+ ggEBAAdklLJrCnZ7a42MWalgiF3Jxch554vKu672us0vIbC4YHOFg3znXGFMQN6s
+ XgfQfwGZvvNvzf2SGvH8p20jjcn/WVKnTNtAUgRT/KQHnAktoASFoLHNY/x+HsWT
+ /wHJw9Sr+eEFPet9lYN9JJu0U8sSC1NKf+kjRcJG7K/6kABscqRVTOJ8fVZzKoz/
+ wUBZw8uhw9U8kad0nyga7JCTMMqX5RvveFIAtnkK77XpJ1vm95VE1Udh03uXUvtN
+ j4nMh5rBX6K6S1rOl7AkRyUW+Nv7ayWjWiU+ASMxnOeo7nfg1xHKLLTf4dUB23ot
+ onq0e4aCSYwqgr4fh8WX2L9+Ncc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bl.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">The British Library</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">British Library</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.bl.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Janice</GivenName>
+ <SurName>Mulholand</SurName>
+ <EmailAddress>mailto:janice.mulholland@bl.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Guy</GivenName>
+ <SurName>Wicks</SurName>
+ <EmailAddress>mailto:Guy.Wicks@bl.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
deleted file mode 100644
index 6de7f9ac..00000000
--- a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.de/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-01T10:15:58Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dshs-koeln.de</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">Deutsche Sporthochschule Köln</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">German Sport University Cologne</mdui:DisplayName>
- <mdui:Description xml:lang="de">Die Deutsche Sporthochschule Köln, 1947 in Köln gegründet, vereint qualifizierte Lehre, internationale Forschung und Spitzensport auf höchstem Niveau. Sie ist Deutschlands einzige Universität, die sich ausschließlich dem Themenfeld Sport und Bewegung widmet. Während an anderen Universitäten die Sportwissenschaft neben vielen weiteren Fachgebieten besteht, findet man in Köln eine außergewöhnliche Situation vor: An 21 Instituten, vier An-Instituten und neun wissenschaftlichen Zentren wird das vielfältige und spannende Gebiet der Sportwissenschaft in allen seinen Facetten detailliert unter die Lupe genommen.</mdui:Description>
- <mdui:Description xml:lang="en">The University is recognized internationally for its research: the Faculty of Biochemistry’s renowned testing laboratory has been a part of the international fight against doping, experiments conducted at the Faculty of Physiology and Anatomy have soared with the astronauts into space, and the Research Centre for Performance Sport has brought together the combined efforts of multiple departments to coach and supervise elite athletes. The 21 faculties at the German Sport University Cologne – from education and humanities to social sciences and biomedicine – offer a diverse array of teaching and research opportunities to the university’s some 5,300 students from more than 60 countries. The campus, located directly across from the Muengersdorf Sport Park, provides students and staff alike a first-class environment for learning, working, and living.</mdui:Description>
- <mdui:Logo height="16" width="16">https://sso.dshs-koeln.de/logo_dshs_kl.png</mdui:Logo>
- <mdui:Logo height="66" width="65">https://sso.dshs-koeln.de/logo_dshs_gr.png</mdui:Logo>
- <mdui:InformationURL xml:lang="de">http://www.dshs-koeln.de/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.dshs-koeln.de/english/</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dshs-koeln.de</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="de">e421</md:OrganizationName>
- <md:OrganizationName xml:lang="en">e421</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">German Sport University Cologne</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="de">http://www.dshs-koeln.de</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
- <md:GivenName>Helpdesk</md:GivenName>
- <md:SurName>DSHS</md:SurName>
- <md:EmailAddress>mailto:support@dshs-koeln.de</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Silke</md:GivenName>
- <md:SurName>Knorr</md:SurName>
- <md:EmailAddress>mailto:s.knorr@dshs-koeln.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index 99a527cd..97724e30 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -15,8 +15,8 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
index d54176c5..82b85619 100644
--- a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -48,8 +48,6 @@
<md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>WAYF</md:GivenName>
- <md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>tato@dtu.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
new file mode 100644
index 00000000..060731c3
--- /dev/null
+++ b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sts.windows.net/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-20T10:07:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier-bs.com</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Montpellier Business School</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQklEQVQoz+2NS07CYBhF7/+opUBboISHAiZKQlyAiQtw7shVuAQX4TZ0D04cuQITElAMUB+8SmnLo6X9nOjQBOee4ck9uUw7v85qqTjacinmC3+7WgFMSe9dXV4UTTOO45gQJ+AMCUFwyNNmIaXI4cQXnNUK+Wbl0J563c/IMvQwisKYWRnsm/TusrKejH0m61ZG2xMlQw2CTbmYPakVnvpj4nHLipxgM/HIEOgOI0tXVkvSJROonx1XjJc39+gg1xk6r2Pv9r7dapQaluoH/nTu9T4W1ZxoD2Z6Ch3bleW8OXCTIJG9SWiP19VKvl7OZdLq47MDAMDICWbLJTGxsZP+aMFu7h70tOqvNkRQpFAVORg5pbwuOOccAFuuQyJoqgRYGG0ZEQEggGEnZJIQGECgH0Ug9nv+/bA7/E/r/2BHvgBoo5Hqom3djQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.montpellier-bs.com/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Montpellier Business School - IDP - Production</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Montpellier Business School</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Montpellier Business School - IDP - Production</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC4jCCAcqgAwIBAgIQQNXrmzhLN4VGlUXDYCRT3zANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4XDTE0MTAyODAwMDAwMFoXDTE2MTAyNzAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyKs/uPhEf7zVizjfcr/ISGFe9+yUOqwpel38zgutvLHmFD39E2hpPdQhcXn4c4dt1fU5KvkbcDdVbP8+e4TvNpJMy/nEB2V92zCQ/hhBjilwhF1ETe1TMmVjALs0KFvbxW9ZN3EdUVvxFvz/gvG29nQhl4QWKj3x8opr89lmq14Z7T0mzOV8kub+cgsOU/1bsKqrIqN1fMKKFhjKaetctdjYTfGzVQ0AJAzzbtg0/Q1wdYNAnhSDafygEv6kNiquk0r0RyasUUevEXs2LY3vSgKsKseI8ZZlQEMtE9/k/iAG7JNcEbVg53YTurNTrPnXJOU88mf3TToX14HpYsS1ECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAfolx45w0i8CdAUjjeAaYdhG9+NDHxop0UvNOqlGqYJexqPLuvX8iyUaYxNGzZxFgGI3GpKfmQP2JQWQ1E5JtY/n8iNLOKRMwqkuxSCKJxZJq4Sl/m/Yv7TS1P5LNgAj8QLCypxsWrTAmq2HSpkeSk4JBtsYxX6uhbGM/K1sEktKybVTHu22/7TmRqWTmOUy9wQvMjJb2IXdMGLG3hVntN/WWcs5w8vbt1i8Kk6o19W2MjZ95JaECKjBDYRlhG1KmSBtrsKsCBQoBzwH/rXfksTO9JoUYLXiW0IppB7DhNH4PJ5hZI91R8rR0H3/bKkLSuDaKLWSqMhozdhXsIIKvJQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Montpellier Business School</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Montpellier Business School</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.montpellier-bs.com/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>admin.infra.dsi@montpellier-bs.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..a1579bbe
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.abertay.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "Test Unidesk - Abertay" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:27:51Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7TCCAtWgAwIBAgIJAPUeIQj7lZ7QMA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI0
+ WhcNMjYwMzMwMTIzNTI0WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jHonD5R
+ ppuiFhtJsgXq/4z/rPdkJItKFdE9PlTjTHHBtpPolHTgVRRspCneX6CTdFVtGG8z
+ 25gdnmfs2ykUxyk1nzSzFJLV4tBKM1mOgYeZXYrcAXrppfkZARFybooj3zZn6XNi
+ 77vPuWiKWQBUAMAeTNxt1+CGWQXYA0c/quHwIyiWnAyzKM8FiN5JOQrJ4cFszE3U
+ uhGannOO0RDv5bI2YWxEAx7IYFSGVm68Kwl/C6lQ1fcUoTqsGS/3YQEQGDdCG9cU
+ 4yALCA5f7Mj/PmFtnK3e0Y6MCVnNtWH/7958eMAVv4RgrqmQuPRbiCox+HeaK1aK
+ iiWq9DuF3QS4BQIDAQABo4G7MIG4MB0GA1UdDgQWBBT7z4eRV9C/3pmldtooNQTp
+ yu2oVzCBiAYDVR0jBIGAMH6AFPvPh5FX0L/emaV22ig1BOnK7ahXoVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkA9R4hCPuVntAw
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVqr3p35sr70RxxlCdqKl
+ 1/qZJHd5G+I4TUJBXLZVXS9z8yXZoGQeHiRkrIm2++sVen2iBXG87CKfHvuFfqH2
+ DtxuSSxw0EOPAzY9uYBMkzbtuos4LxflATngm5B943+++DYQoLTbs98sWLhFjgOC
+ cNXXa//18LXVQ/Y21QuRQctu4UbdGrP5qWtKsjCmmv/XVH8/J52tf0xf/uygp0Ip
+ kPOD+P7yHonb3slyoqg2k45mvpCFVkKreWvd20Hi4kqPhEKFYs4X6QCsMRlH7KMN
+ 1mSmbpr5sfg/lzDP6EYvvDdUPL4Nu5rkd3wYN+3s82k8xYFDgG+fKO2x9EUwmtQ7
+ JA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7TCCAtWgAwIBAgIJAPUeIQj7lZ7QMA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI0
+ WhcNMjYwMzMwMTIzNTI0WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jHonD5R
+ ppuiFhtJsgXq/4z/rPdkJItKFdE9PlTjTHHBtpPolHTgVRRspCneX6CTdFVtGG8z
+ 25gdnmfs2ykUxyk1nzSzFJLV4tBKM1mOgYeZXYrcAXrppfkZARFybooj3zZn6XNi
+ 77vPuWiKWQBUAMAeTNxt1+CGWQXYA0c/quHwIyiWnAyzKM8FiN5JOQrJ4cFszE3U
+ uhGannOO0RDv5bI2YWxEAx7IYFSGVm68Kwl/C6lQ1fcUoTqsGS/3YQEQGDdCG9cU
+ 4yALCA5f7Mj/PmFtnK3e0Y6MCVnNtWH/7958eMAVv4RgrqmQuPRbiCox+HeaK1aK
+ iiWq9DuF3QS4BQIDAQABo4G7MIG4MB0GA1UdDgQWBBT7z4eRV9C/3pmldtooNQTp
+ yu2oVzCBiAYDVR0jBIGAMH6AFPvPh5FX0L/emaV22ig1BOnK7ahXoVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkA9R4hCPuVntAw
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVqr3p35sr70RxxlCdqKl
+ 1/qZJHd5G+I4TUJBXLZVXS9z8yXZoGQeHiRkrIm2++sVen2iBXG87CKfHvuFfqH2
+ DtxuSSxw0EOPAzY9uYBMkzbtuos4LxflATngm5B943+++DYQoLTbs98sWLhFjgOC
+ cNXXa//18LXVQ/Y21QuRQctu4UbdGrP5qWtKsjCmmv/XVH8/J52tf0xf/uygp0Ip
+ kPOD+P7yHonb3slyoqg2k45mvpCFVkKreWvd20Hi4kqPhEKFYs4X6QCsMRlH7KMN
+ 1mSmbpr5sfg/lzDP6EYvvDdUPL4Nu5rkd3wYN+3s82k8xYFDgG+fKO2x9EUwmtQ7
+ JA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Abertay</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..bbf0e4b3
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.abertay.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "Test Unidesk - Abertay" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:27:30Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7TCCAtWgAwIBAgIJAKb90q3jCoX6MA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI2
+ WhcNMjYwMzMwMTIzNTI2WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/g97614
+ +AFKYGTwsyWijqMFEU0kqLrP/UsTpCDeJh8quiaBTr38UrLBrovxlItPpkqbIaxP
+ lhTxwZHDg13MPqiRNdIKT9woaegI7fwjgKkd497b7nlqvYPkSaVqguz6f5SCBMUn
+ YKgyFmCpBq9NEO8vCPOM4rpcYRIkvUeR5MT3pTe3GJvbwiomIlkK/E+ad8h153UD
+ qnF+bmmtriP4s5mxDF/2uVP+Rvf43NU7XnNUyWXHusyAH9ENHp6j42kkqGN3uRdE
+ 6R0Sc0vVvlMT1OIfaJBDa1aoFo/oDyX0nh+346GoShCg01iygTz5C1GC8TPzK7Oo
+ FAS3BIQWTLWyqQIDAQABo4G7MIG4MB0GA1UdDgQWBBRXr6CxoOyUDhr0A2Zc91Ee
+ HLXkvjCBiAYDVR0jBIGAMH6AFFevoLGg7JQOGvQDZlz3UR4cteS+oVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkApv3SreMKhfow
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAlHFolMwX31uyP+qbQFoC
+ 55phkzHYo5JF6Zamk+v7sqi4mP9JkkbJGhKGz6rNxf2/COFgryc0V+iV0vfggrzO
+ rOqWOg/hXGVwqF2kLHs520Uk0ZH3U0K1+NvJZHsyqslkgjIQkpzLn7kfVGYp1i6I
+ w7Nr6ST2g6ilGlB2D8Jk4JCIxIwuU6cV5XV3Fy4OuWck0oPfOK3zDCCcxSW8wOmw
+ /rBBSrt3FfAHM+4WO/YZVIpnKMQikmHRc4wxW8obHYu+Ut4DXWoPoqNBumdBVv/g
+ sSw+9Fu2Zto/cMH17ZPL6F/LSnVBWRhfNuGP9+JhGbRqFUtn5AedGAdzwyc9ngfn
+ dQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7TCCAtWgAwIBAgIJAKb90q3jCoX6MA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI2
+ WhcNMjYwMzMwMTIzNTI2WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/g97614
+ +AFKYGTwsyWijqMFEU0kqLrP/UsTpCDeJh8quiaBTr38UrLBrovxlItPpkqbIaxP
+ lhTxwZHDg13MPqiRNdIKT9woaegI7fwjgKkd497b7nlqvYPkSaVqguz6f5SCBMUn
+ YKgyFmCpBq9NEO8vCPOM4rpcYRIkvUeR5MT3pTe3GJvbwiomIlkK/E+ad8h153UD
+ qnF+bmmtriP4s5mxDF/2uVP+Rvf43NU7XnNUyWXHusyAH9ENHp6j42kkqGN3uRdE
+ 6R0Sc0vVvlMT1OIfaJBDa1aoFo/oDyX0nh+346GoShCg01iygTz5C1GC8TPzK7Oo
+ FAS3BIQWTLWyqQIDAQABo4G7MIG4MB0GA1UdDgQWBBRXr6CxoOyUDhr0A2Zc91Ee
+ HLXkvjCBiAYDVR0jBIGAMH6AFFevoLGg7JQOGvQDZlz3UR4cteS+oVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkApv3SreMKhfow
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAlHFolMwX31uyP+qbQFoC
+ 55phkzHYo5JF6Zamk+v7sqi4mP9JkkbJGhKGz6rNxf2/COFgryc0V+iV0vfggrzO
+ rOqWOg/hXGVwqF2kLHs520Uk0ZH3U0K1+NvJZHsyqslkgjIQkpzLn7kfVGYp1i6I
+ w7Nr6ST2g6ilGlB2D8Jk4JCIxIwuU6cV5XV3Fy4OuWck0oPfOK3zDCCcxSW8wOmw
+ /rBBSrt3FfAHM+4WO/YZVIpnKMQikmHRc4wxW8obHYu+Ut4DXWoPoqNBumdBVv/g
+ sSw+9Fu2Zto/cMH17ZPL6F/LSnVBWRhfNuGP9+JhGbRqFUtn5AedGAdzwyc9ngfn
+ dQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Abertay</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..3766d11d
--- /dev/null
+++ b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.napier.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T09:17:46Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJAKmmxe2VazNBMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNVoX
+ DTI2MDMyMzE0NDUyNVowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC155YdrjNo8XNz
+ HvpvZVos38MRNXfRErCpRzvJRUi8HGJqFWRTLOA1MMpxjL/P2Nw/n4W9PcN3OLW6
+ 5WOeXVtB+wI/V1ptG9T+7NSnfdg4a+zLnS612tx7zYs4ylup1m0px7RgADgmvnnp
+ SSD/LO9ZlVuV1llrYM1EMt0xJCXFnlYqaMgqTpJ9bQdRhn+UakEchNS31lYWvnGY
+ xj+uUYO0ukYhf1RJMJqCCXwpMaUBloimwkF/COs6InnrjMO7yQSLHSDw6C1+0jla
+ Q7tjYfGfgWfMzWIDvAZiWXOxq54NgHI4xBstLTM5ynaRa7glGZ46rXNmtadkpFUu
+ tEN9XFfJAgMBAAGjgbgwgbUwHQYDVR0OBBYEFIOsVsQYekIKAIZkcAQ1JgQd9GaJ
+ MIGFBgNVHSMEfjB8gBSDrFbEGHpCCgCGZHAENSYEHfRmiaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCppsXtlWszQTAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCcOV5eUITv5zxMeUZYFRWh7Vb1eEOK
+ TMao1dR5BrrTzmzindDU8z1WYGeGhbz7IOt6qx4lx2bCu5/lcCqN6j2TJ/Zc60Q0
+ 0RPDa+ozlyu8EOwD6YuQhIoa813RUBPcV3ILyxsn8/H03HuSk+rDSziDrp0dL17q
+ qRAZ7DDiNXxVjsOOAKfwATlpBbK7WLP2VG0iMynU4W8YxDNyhQr1hD8aQug14bKI
+ FkzIoHsq1aZYLTSSbRmEm4SOd0nhG0N+DRElzuwzE4NJIYAH3wZEg8V6CvLPjLPm
+ yaZCgX4d+/NdqDiRw8ysu9XHE+tUXPC9XpWhRKbUV4qCmYsvtMzFYrrs
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJAKmmxe2VazNBMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNVoX
+ DTI2MDMyMzE0NDUyNVowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC155YdrjNo8XNz
+ HvpvZVos38MRNXfRErCpRzvJRUi8HGJqFWRTLOA1MMpxjL/P2Nw/n4W9PcN3OLW6
+ 5WOeXVtB+wI/V1ptG9T+7NSnfdg4a+zLnS612tx7zYs4ylup1m0px7RgADgmvnnp
+ SSD/LO9ZlVuV1llrYM1EMt0xJCXFnlYqaMgqTpJ9bQdRhn+UakEchNS31lYWvnGY
+ xj+uUYO0ukYhf1RJMJqCCXwpMaUBloimwkF/COs6InnrjMO7yQSLHSDw6C1+0jla
+ Q7tjYfGfgWfMzWIDvAZiWXOxq54NgHI4xBstLTM5ynaRa7glGZ46rXNmtadkpFUu
+ tEN9XFfJAgMBAAGjgbgwgbUwHQYDVR0OBBYEFIOsVsQYekIKAIZkcAQ1JgQd9GaJ
+ MIGFBgNVHSMEfjB8gBSDrFbEGHpCCgCGZHAENSYEHfRmiaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCppsXtlWszQTAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCcOV5eUITv5zxMeUZYFRWh7Vb1eEOK
+ TMao1dR5BrrTzmzindDU8z1WYGeGhbz7IOt6qx4lx2bCu5/lcCqN6j2TJ/Zc60Q0
+ 0RPDa+ozlyu8EOwD6YuQhIoa813RUBPcV3ILyxsn8/H03HuSk+rDSziDrp0dL17q
+ qRAZ7DDiNXxVjsOOAKfwATlpBbK7WLP2VG0iMynU4W8YxDNyhQr1hD8aQug14bKI
+ FkzIoHsq1aZYLTSSbRmEm4SOd0nhG0N+DRElzuwzE4NJIYAH3wZEg8V6CvLPjLPm
+ yaZCgX4d+/NdqDiRw8ysu9XHE+tUXPC9XpWhRKbUV4qCmYsvtMzFYrrs
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.napier.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Napier</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..02304867
--- /dev/null
+++ b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.napier.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T09:19:47Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJALDwEI9HqzwmMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNloX
+ DTI2MDMyMzE0NDUyNlowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CZdoVgdpI5GH
+ tLbxPGK7YsiaciujrnLSwBIDoiBiC9Ktg0v4aqUmXUO3qUpXRiQZ27zkPLBqWN2t
+ nI91lBMKB8pcsHVTAE9CGyZqDxrcA8qjVtSVogAaN9OAhZ246Rf9vcD6bD23kZ8b
+ p5VU+DKO4c630i7WpjYlTjiT1lBjMPaK8eIJa/cHdOGyV0ZsIE9mkXjOGz77nzQQ
+ b/XgSQBURFscEszUMvsDR6aiJD8tGhC1B04bfnZBTGlfod5P7LHb66DOYGHbobxZ
+ 6ySBktMpBwAR5GjfxfZesKSfRYSJ7HH9AxeCfsMcl5IoxEHRm1rBRaZipGlrMjnE
+ a+fwHI/pAgMBAAGjgbgwgbUwHQYDVR0OBBYEFFRjbf5Cssg5VmJSaMbtUcecnSOo
+ MIGFBgNVHSMEfjB8gBRUY23+QrLIOVZiUmjG7VHHnJ0jqKFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCw8BCPR6s8JjAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBlYjCA1NO5uEvVIKnZ9Pp8fgtrlvCR
+ mWmTRJiB6UIwCxvulHPMSk3Yf8YInG0Uu85xImYF40pjI77t/Vxp0w9Dnr5AccO4
+ pOoB0aloZqW+iyNICvNhI4IEzoDbttPbRvb2HRcpahbySUQTrwVSni8cE9flBpBg
+ 7LI1pZcPt5mnO3/9Pkod2/wCUE27hPLJG8IvzAZ8mHsFYSPWijiKkvmM4BoEDRJk
+ 1YdtL5xTLOLE8C8NnNHOwyHC0S7NGnYiV+L6JPkP6DzZAILb3DYLEgXNGzjCnpNn
+ OEXG4w6V9oQj82r4pWPQ4RS99T86clSzjEPzlrUJO6cPMntuH3yuLHKA
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJALDwEI9HqzwmMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNloX
+ DTI2MDMyMzE0NDUyNlowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CZdoVgdpI5GH
+ tLbxPGK7YsiaciujrnLSwBIDoiBiC9Ktg0v4aqUmXUO3qUpXRiQZ27zkPLBqWN2t
+ nI91lBMKB8pcsHVTAE9CGyZqDxrcA8qjVtSVogAaN9OAhZ246Rf9vcD6bD23kZ8b
+ p5VU+DKO4c630i7WpjYlTjiT1lBjMPaK8eIJa/cHdOGyV0ZsIE9mkXjOGz77nzQQ
+ b/XgSQBURFscEszUMvsDR6aiJD8tGhC1B04bfnZBTGlfod5P7LHb66DOYGHbobxZ
+ 6ySBktMpBwAR5GjfxfZesKSfRYSJ7HH9AxeCfsMcl5IoxEHRm1rBRaZipGlrMjnE
+ a+fwHI/pAgMBAAGjgbgwgbUwHQYDVR0OBBYEFFRjbf5Cssg5VmJSaMbtUcecnSOo
+ MIGFBgNVHSMEfjB8gBRUY23+QrLIOVZiUmjG7VHHnJ0jqKFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCw8BCPR6s8JjAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBlYjCA1NO5uEvVIKnZ9Pp8fgtrlvCR
+ mWmTRJiB6UIwCxvulHPMSk3Yf8YInG0Uu85xImYF40pjI77t/Vxp0w9Dnr5AccO4
+ pOoB0aloZqW+iyNICvNhI4IEzoDbttPbRvb2HRcpahbySUQTrwVSni8cE9flBpBg
+ 7LI1pZcPt5mnO3/9Pkod2/wCUE27hPLJG8IvzAZ8mHsFYSPWijiKkvmM4BoEDRJk
+ 1YdtL5xTLOLE8C8NnNHOwyHC0S7NGnYiV+L6JPkP6DzZAILb3DYLEgXNGzjCnpNn
+ OEXG4w6V9oQj82r4pWPQ4RS99T86clSzjEPzlrUJO6cPMntuH3yuLHKA
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.napier.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Napier</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml b/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
deleted file mode 100644
index fcd30142..00000000
--- a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.openathens.net/oala/metadata">
- <!--
- This is an OpenAthens LA Test IdP for Eduserv.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:53:36Z"/>
- </Extensions>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
- CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
- MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
- c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
- 5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
- 7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
- idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
- 7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
- QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
- o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
- hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
- AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
- nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
- g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
- 4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
- Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
- HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
- CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
- MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
- c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
- 5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
- 7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
- idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
- 7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
- QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
- o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
- hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
- AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
- nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
- g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
- 4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
- Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
- HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.test.openathens.net/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.test.openathens.net/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..8e4f718d
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.shu.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public Sheffield Hallam" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:20:50Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID0zCCArugAwIBAgIJAIZxYEaEw5lGMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOFoXDTI2MDMz
+ MDEyMzYxOFowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJJlXnctUpVTPqInQC60gcrfsD4m5m
+ GTWAWSXlYhKDfq6F7JZe0Nrph06Mx/SYqzwmSJWr9LeyA7gZaR/5lGR9rxAUn26/
+ Zvz14VxsTQlP2YnEePcAwyi698wulMGELyPN4zgo+oEBBpuRDXGqYH7OjqCI+Ktc
+ GJ77yE6XM6TNTLMFFB93QdooI1QXcyOYjhYBq7PpRY4jkyozAW28GJMu6lBdpLua
+ FoGw2N/Qy3aUFQ6WxK2If4URZqjj+W56vZj9COsAGonUO9RxiEFIyp3e+qBW0ua8
+ xps4G4tvV8PT23SGu5caTsAMkx/xdByTso4F5IAO6YLA9SXCDHkfwiX1AgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFDb5sE6vS/3tZXp/gPQKykHPSLV+MH8GA1UdIwR4MHaA
+ FDb5sE6vS/3tZXp/gPQKykHPSLV+oVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJAIZxYEaEw5lGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAFBE8uejSEiTBVTy3ehydf78gUIz2mfDjtFFnoTK4Atok6I2ABqeXAlB
+ p2LQ1dwM6nS3Or8dctOtx8aRmcvf8DTXWCcC3dSSLeU8lzl/GnBeGMKEoYAKmWVz
+ p0O1/0XtuRc1m1j0OzCUnuDAI0Vn31fby2Q0oGYdwTGeCd+DjoEbCVLUPGGerb9T
+ seyS9bm/fmyGdlKw6Y44M7Cj9crf7faGZkDbdXxIf+mCyQBNBS0X90LMHFcR/gr/
+ V6IR7SHk+cpzw5ENh4+25GYzL0/qYDhp8YSYqU5ioWRqTLOZf11dLSWUQZUHmFE+
+ siyQlKd1yPLqIHp5HYHIQLLIZN+HLlM=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID0zCCArugAwIBAgIJAIZxYEaEw5lGMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOFoXDTI2MDMz
+ MDEyMzYxOFowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJJlXnctUpVTPqInQC60gcrfsD4m5m
+ GTWAWSXlYhKDfq6F7JZe0Nrph06Mx/SYqzwmSJWr9LeyA7gZaR/5lGR9rxAUn26/
+ Zvz14VxsTQlP2YnEePcAwyi698wulMGELyPN4zgo+oEBBpuRDXGqYH7OjqCI+Ktc
+ GJ77yE6XM6TNTLMFFB93QdooI1QXcyOYjhYBq7PpRY4jkyozAW28GJMu6lBdpLua
+ FoGw2N/Qy3aUFQ6WxK2If4URZqjj+W56vZj9COsAGonUO9RxiEFIyp3e+qBW0ua8
+ xps4G4tvV8PT23SGu5caTsAMkx/xdByTso4F5IAO6YLA9SXCDHkfwiX1AgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFDb5sE6vS/3tZXp/gPQKykHPSLV+MH8GA1UdIwR4MHaA
+ FDb5sE6vS/3tZXp/gPQKykHPSLV+oVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJAIZxYEaEw5lGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAFBE8uejSEiTBVTy3ehydf78gUIz2mfDjtFFnoTK4Atok6I2ABqeXAlB
+ p2LQ1dwM6nS3Or8dctOtx8aRmcvf8DTXWCcC3dSSLeU8lzl/GnBeGMKEoYAKmWVz
+ p0O1/0XtuRc1m1j0OzCUnuDAI0Vn31fby2Q0oGYdwTGeCd+DjoEbCVLUPGGerb9T
+ seyS9bm/fmyGdlKw6Y44M7Cj9crf7faGZkDbdXxIf+mCyQBNBS0X90LMHFcR/gr/
+ V6IR7SHk+cpzw5ENh4+25GYzL0/qYDhp8YSYqU5ioWRqTLOZf11dLSWUQZUHmFE+
+ siyQlKd1yPLqIHp5HYHIQLLIZN+HLlM=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Sheffiield Hallam</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..e4039b6b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.shu.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure Sheffield Hallam" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:24:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID0zCCArugAwIBAgIJALBHKHpsKjfyMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOVoXDTI2MDMz
+ MDEyMzYxOVowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6BE+AHvxhh5q88U3GlX556bzJjhZu
+ limEOPyhKIEuZMmygWR01GO/1zZGLSIdnF/7StnZyJwn4Z1CLzaCzHGTMq4lVoiI
+ JYsydP/J+E8yO5fpITM3/zq+3yApmcexJKGhJq6E/uvzKWo6DofPvHz6sgAFKIH7
+ XPk/KR2vUOb3Vu1CkhxsN1YGzGuN7+FAWnoxDtGSUvu/3j4YuWZ8t/+OblntSH4W
+ hVL+/UV9QKf9Kgqd/wIzehQuMqAQdtxGCkKQO2m1Bc5bH++jfvBL3rPY7QMNl2hE
+ WkxW6P2FYoDqaXYXj5trNPxf1Fi3gMFvr7Po+hzTLlNH+Tqf990US6kvAgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFMc2jbMrxfUP/MwpLJn7GnBWwN5GMH8GA1UdIwR4MHaA
+ FMc2jbMrxfUP/MwpLJn7GnBWwN5GoVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJALBHKHpsKjfyMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAGCe0HFNZpIWDAGeADGdJHOmp/Z8qaTVLxpBbo1a4R6PxZ94vAQ+h5/Q
+ IzbXfCxSlMhRJXgsD95039M4mSdQf3HoF9N+q7HAp/uR6H7uyMUwXANnoEdCpIqx
+ E8c64IxOPPL/1lCXjf45Dw9SheVAa88crlQPCgZLM8jdZEcuV1MSyTbwqy61LW2a
+ wjSfU2D+uDKdXg3SSbBd3ZXM4S1ca2FM59Jbn+WEvyZfdm8Mq7Sgo2BYPDAJN8u5
+ pGSWHqxUKYeFTFZfnKMVJt3nQWdYezNeBSSaBDVjE8MpOevfSTINlrNs63yVBTDe
+ TyVSTqgYbbTOk1MtZWZr4+LMXyo66QI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID0zCCArugAwIBAgIJALBHKHpsKjfyMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOVoXDTI2MDMz
+ MDEyMzYxOVowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6BE+AHvxhh5q88U3GlX556bzJjhZu
+ limEOPyhKIEuZMmygWR01GO/1zZGLSIdnF/7StnZyJwn4Z1CLzaCzHGTMq4lVoiI
+ JYsydP/J+E8yO5fpITM3/zq+3yApmcexJKGhJq6E/uvzKWo6DofPvHz6sgAFKIH7
+ XPk/KR2vUOb3Vu1CkhxsN1YGzGuN7+FAWnoxDtGSUvu/3j4YuWZ8t/+OblntSH4W
+ hVL+/UV9QKf9Kgqd/wIzehQuMqAQdtxGCkKQO2m1Bc5bH++jfvBL3rPY7QMNl2hE
+ WkxW6P2FYoDqaXYXj5trNPxf1Fi3gMFvr7Po+hzTLlNH+Tqf990US6kvAgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFMc2jbMrxfUP/MwpLJn7GnBWwN5GMH8GA1UdIwR4MHaA
+ FMc2jbMrxfUP/MwpLJn7GnBWwN5GoVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJALBHKHpsKjfyMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAGCe0HFNZpIWDAGeADGdJHOmp/Z8qaTVLxpBbo1a4R6PxZ94vAQ+h5/Q
+ IzbXfCxSlMhRJXgsD95039M4mSdQf3HoF9N+q7HAp/uR6H7uyMUwXANnoEdCpIqx
+ E8c64IxOPPL/1lCXjf45Dw9SheVAa88crlQPCgZLM8jdZEcuV1MSyTbwqy61LW2a
+ wjSfU2D+uDKdXg3SSbBd3ZXM4S1ca2FM59Jbn+WEvyZfdm8Mq7Sgo2BYPDAJN8u5
+ pGSWHqxUKYeFTFZfnKMVJt3nQWdYezNeBSSaBDVjE8MpOevfSTINlrNs63yVBTDe
+ TyVSTqgYbbTOk1MtZWZr4+LMXyo66QI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Sheffield Hallam</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..c2dd3a45
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.st-andrews.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public St Andrews" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:31:26Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEADCCAuigAwIBAgIJAIhMwPcgL4J5MA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUwWhcNMjYwMzMwMTIzNjUwWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAvBcmVk31O/rqO8dyHPtQO+zFANQpbcQo+roH+vJ4QZ/f5JV/BSEzdRY8
+ mqaEV3YFg6a45kwYLum/hBBHsgCiu6qzByANuqjvqF2q+O4oJ2dIPlUW4g9BF/UY
+ otVDcMySPQ7siPagE1arNivCZ+aAwcmxHiuZsJOIzg+kHgYFPfGeD11VVTZyPED3
+ aU5y/lrmU5X5rnQWRNnBoXZX6WXmaNY9wMJbjSWzPlC47qlmXgdQC8cbtdVFuPkx
+ bC7lGLcwnQRrLDD3gRrX1RiQ88nL9HWQNdydjkMoFR7lwvhSUbdyeatMwbHZOcU5
+ VzIR/XIpaHYXuNMfJqHcFHBOR2jD3QIDAQABo4HCMIG/MB0GA1UdDgQWBBTLoPSB
+ 7fSfWEPknMfVn8Iy20sngDCBjwYDVR0jBIGHMIGEgBTLoPSB7fSfWEPknMfVn8Iy
+ 20sngKFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAIhMwPcgL4J5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAB+o2KHNBwJgL1fP5DEBPTxO6s3t2NIf2YNNF400XOFCNXgtf2OxcT0YpiVc
+ kK+oVYXdGXUsLXYVALL4SdV3rzr4f0CFfJAhkys5W1aXWn/2TFfWNLyMwsupIqsJ
+ t89ibeUf4T/hQfWBIML05G9+IuN/nZNyoL8Gf+iyTOL89TeEPxRzzfKG8aNODiXk
+ pugdN/9rBMZjbrbeMbrA9XGbz7OBi8ugeSE9rH6XzhTQu6uiZP0zKyPta6XzO5H1
+ 0QyClOifYBk4hUb9/SykFPKtpM1VVDgQ9IMND6WaT1L/JjAumGcnnuRRySj+63/i
+ QaeR6JDD8INXBiQ9NMNkI33uQZY=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEADCCAuigAwIBAgIJAIhMwPcgL4J5MA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUwWhcNMjYwMzMwMTIzNjUwWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAvBcmVk31O/rqO8dyHPtQO+zFANQpbcQo+roH+vJ4QZ/f5JV/BSEzdRY8
+ mqaEV3YFg6a45kwYLum/hBBHsgCiu6qzByANuqjvqF2q+O4oJ2dIPlUW4g9BF/UY
+ otVDcMySPQ7siPagE1arNivCZ+aAwcmxHiuZsJOIzg+kHgYFPfGeD11VVTZyPED3
+ aU5y/lrmU5X5rnQWRNnBoXZX6WXmaNY9wMJbjSWzPlC47qlmXgdQC8cbtdVFuPkx
+ bC7lGLcwnQRrLDD3gRrX1RiQ88nL9HWQNdydjkMoFR7lwvhSUbdyeatMwbHZOcU5
+ VzIR/XIpaHYXuNMfJqHcFHBOR2jD3QIDAQABo4HCMIG/MB0GA1UdDgQWBBTLoPSB
+ 7fSfWEPknMfVn8Iy20sngDCBjwYDVR0jBIGHMIGEgBTLoPSB7fSfWEPknMfVn8Iy
+ 20sngKFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAIhMwPcgL4J5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAB+o2KHNBwJgL1fP5DEBPTxO6s3t2NIf2YNNF400XOFCNXgtf2OxcT0YpiVc
+ kK+oVYXdGXUsLXYVALL4SdV3rzr4f0CFfJAhkys5W1aXWn/2TFfWNLyMwsupIqsJ
+ t89ibeUf4T/hQfWBIML05G9+IuN/nZNyoL8Gf+iyTOL89TeEPxRzzfKG8aNODiXk
+ pugdN/9rBMZjbrbeMbrA9XGbz7OBi8ugeSE9rH6XzhTQu6uiZP0zKyPta6XzO5H1
+ 0QyClOifYBk4hUb9/SykFPKtpM1VVDgQ9IMND6WaT1L/JjAumGcnnuRRySj+63/i
+ QaeR6JDD8INXBiQ9NMNkI33uQZY=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - St Andrews</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..dc066cb5
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.st-andrews.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure St Andrews" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:34:13Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEADCCAuigAwIBAgIJAL3Y8PpzyOKTMA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUxWhcNMjYwMzMwMTIzNjUxWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAzAL+qWB1ilhsj9Up9IOTrKbobvYAAuBvy5ea9KePlZNaxZ9D2/fye1WL
+ zAtzBVBUZxofWYbkmQ31Av0OT4QPXcR3Koqs6HkjBJatjRJ5jdlyG98j0EEEXfb/
+ sT5MQ/U4YauOf2H7c8M/JP8+PL97r/3eAaiMnya/CRZZDkqE2Ib1mQVvGX5Jl++G
+ tVumwW0v2GRLIFWgNByF62vNIPNDfM7+EPiZSE2vxIJ1uIB/Zbc4CTgU9Ah4W2cc
+ xAMeEm/7TL75HCs3ZfKXbjZSNB7QpdCgQCpREHjKPVg6xAazsbXXQ66byCt10fic
+ X9OeztcDJdj0tIgTl7tU9oZ8BGCbBwIDAQABo4HCMIG/MB0GA1UdDgQWBBQiT0Yu
+ SG+CekTXxr0u1lengc4v5TCBjwYDVR0jBIGHMIGEgBQiT0YuSG+CekTXxr0u1len
+ gc4v5aFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAL3Y8PpzyOKTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAEWMQiWOK6hKtuggI21WHZ2WSXc+LqchHtjbqcipHhPsR7tH2kzIxaqawRRB
+ jaiZZ22nyDurQ4um2rVG25dxFFA1EM+OjuKKEiwDmWMNkypRa19O4vq3WhdF2CKq
+ DVC+wFRVRIvA+CFYnQt3v1Lj/ZFWmUgfH1DhBg9D2ff7hKsCO/6pvl1XLIkM+rvO
+ 6F4ojfCzs8ZE4ZEXe9Tvddmv0bsVdMk5Px81i8vPd+z4vgfHnnzYS4ZLrxifKAhW
+ WufvINMxu4brjSiVcSFmZqwo2rD/tzI7d7Ax+n/ziLxULAEBTg1AT2t3aAELPj/m
+ HoIyjVh4zNDQNVRgra00piqEoZU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEADCCAuigAwIBAgIJAL3Y8PpzyOKTMA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUxWhcNMjYwMzMwMTIzNjUxWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAzAL+qWB1ilhsj9Up9IOTrKbobvYAAuBvy5ea9KePlZNaxZ9D2/fye1WL
+ zAtzBVBUZxofWYbkmQ31Av0OT4QPXcR3Koqs6HkjBJatjRJ5jdlyG98j0EEEXfb/
+ sT5MQ/U4YauOf2H7c8M/JP8+PL97r/3eAaiMnya/CRZZDkqE2Ib1mQVvGX5Jl++G
+ tVumwW0v2GRLIFWgNByF62vNIPNDfM7+EPiZSE2vxIJ1uIB/Zbc4CTgU9Ah4W2cc
+ xAMeEm/7TL75HCs3ZfKXbjZSNB7QpdCgQCpREHjKPVg6xAazsbXXQ66byCt10fic
+ X9OeztcDJdj0tIgTl7tU9oZ8BGCbBwIDAQABo4HCMIG/MB0GA1UdDgQWBBQiT0Yu
+ SG+CekTXxr0u1lengc4v5TCBjwYDVR0jBIGHMIGEgBQiT0YuSG+CekTXxr0u1len
+ gc4v5aFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAL3Y8PpzyOKTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAEWMQiWOK6hKtuggI21WHZ2WSXc+LqchHtjbqcipHhPsR7tH2kzIxaqawRRB
+ jaiZZ22nyDurQ4um2rVG25dxFFA1EM+OjuKKEiwDmWMNkypRa19O4vq3WhdF2CKq
+ DVC+wFRVRIvA+CFYnQt3v1Lj/ZFWmUgfH1DhBg9D2ff7hKsCO/6pvl1XLIkM+rvO
+ 6F4ojfCzs8ZE4ZEXe9Tvddmv0bsVdMk5Px81i8vPd+z4vgfHnnzYS4ZLrxifKAhW
+ WufvINMxu4brjSiVcSFmZqwo2rD/tzI7d7Ax+n/ziLxULAEBTg1AT2t3aAELPj/m
+ HoIyjVh4zNDQNVRgra00piqEoZU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - St Andrews</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..609183a7
--- /dev/null
+++ b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.stir.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public Stirling" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:47:56Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID2jCCAsKgAwIBAgIJANyOrK6P4z4IMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE4WhcNMjYw
+ MzMwMTIzNzE4WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0/TrlARELCO2seaUN5x9qwXm
+ oMpDksEGPHgRa40wqvHnF/1ebwuJ/a0L2XW7OLt1Lg4J5N1B/VxJ76qt4c9rqY0k
+ fKAcbwLjUDXLG4R61/ixw1U5g8TkxGWs/b1QZzYN1mXGqYZXQEehau4jrsLlj5u+
+ 2llO5Io0AkRSOYjZCjd1lWaqj4nVYJD8EVIugxnzJZ6Er3sys+izkhwUXueJSieJ
+ TOPurN9fHt/qiwg8OY+v8rUfHM6c6tGQHrYEThad+fzhfS8mATMs0Ghw85vGYiqn
+ VBece+oe4iTxmZyFXr3Syd+Nwb8WBlH0DDrj9SVC2HLttXsHTRexKOAeXjTzNwID
+ AQABo4G0MIGxMB0GA1UdDgQWBBQ5yaFQUQPTK5YABLJFqvVyQyTx/DCBgQYDVR0j
+ BHoweIAUOcmhUFED0yuWAASyRar1ckMk8fyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQDcjqyuj+M+CDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQBGPthismR3ASkL4uXomIVPyWLvAEwfuOInJXcAWFTUzuXM
+ NsnEqPjIY+oq9sC9ALo0Ne7X0MhXaBie+P/+tZMRq6EoYT0moDMIsFC/MZaEiRUa
+ 6mhwksA4PVEwhYEqL2C0HtpkIB5eJ7cqnQCQIlsSxQYUVP/J01rW/WX5CDnaVG+l
+ sINoMQr42MaRYjduErB1j0WvpN+p+g98NS9vSPCcFTFTK28syLDlgDPwlPYTAfV7
+ /z1ISaVQYVdUyh+sUrWuY2lHH3u9OtoE7FZrA2YUkD+fV3MzlIrRX/Ku8/iq+bqe
+ lRHGvV+PFtz4Y8zu1o61fq5+Fm2S0oHYtgDRVudH
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID2jCCAsKgAwIBAgIJANyOrK6P4z4IMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE4WhcNMjYw
+ MzMwMTIzNzE4WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0/TrlARELCO2seaUN5x9qwXm
+ oMpDksEGPHgRa40wqvHnF/1ebwuJ/a0L2XW7OLt1Lg4J5N1B/VxJ76qt4c9rqY0k
+ fKAcbwLjUDXLG4R61/ixw1U5g8TkxGWs/b1QZzYN1mXGqYZXQEehau4jrsLlj5u+
+ 2llO5Io0AkRSOYjZCjd1lWaqj4nVYJD8EVIugxnzJZ6Er3sys+izkhwUXueJSieJ
+ TOPurN9fHt/qiwg8OY+v8rUfHM6c6tGQHrYEThad+fzhfS8mATMs0Ghw85vGYiqn
+ VBece+oe4iTxmZyFXr3Syd+Nwb8WBlH0DDrj9SVC2HLttXsHTRexKOAeXjTzNwID
+ AQABo4G0MIGxMB0GA1UdDgQWBBQ5yaFQUQPTK5YABLJFqvVyQyTx/DCBgQYDVR0j
+ BHoweIAUOcmhUFED0yuWAASyRar1ckMk8fyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQDcjqyuj+M+CDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQBGPthismR3ASkL4uXomIVPyWLvAEwfuOInJXcAWFTUzuXM
+ NsnEqPjIY+oq9sC9ALo0Ne7X0MhXaBie+P/+tZMRq6EoYT0moDMIsFC/MZaEiRUa
+ 6mhwksA4PVEwhYEqL2C0HtpkIB5eJ7cqnQCQIlsSxQYUVP/J01rW/WX5CDnaVG+l
+ sINoMQr42MaRYjduErB1j0WvpN+p+g98NS9vSPCcFTFTK28syLDlgDPwlPYTAfV7
+ /z1ISaVQYVdUyh+sUrWuY2lHH3u9OtoE7FZrA2YUkD+fV3MzlIrRX/Ku8/iq+bqe
+ lRHGvV+PFtz4Y8zu1o61fq5+Fm2S0oHYtgDRVudH
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.stir.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Stirling</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..a646ebb4
--- /dev/null
+++ b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.stir.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure Stirling" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:49:49Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID2jCCAsKgAwIBAgIJALr8CP8PS5BEMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE5WhcNMjYw
+ MzMwMTIzNzE5WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgFf2q8W/UjaWOZdNqr9EmOa
+ WG0l2hEosA+IAHcKkdBNdMhNGzED45WLadguUY1F+Irnft2DF/52/rukG/XuFkM1
+ SybLxZdme3ozG91w+TB86/BPTNOl16P2Q3QQ90FdkqZY/rWPMwIRVA5mjKuf6+1T
+ 5PL9/XpQC9JFwXmUXNsNsLJryDgm+13wugMPymrgWmFGZN2HYlSv5TF5mIxVQOYC
+ SjsGZhu88GmRjMxHN1T6OAn7a4HA7/wlEfnl8SQ5TIWPRjQukN9hg/CpYC2zI17G
+ /606x/P4lkJ37/NErZ/u4ueA4ymhyWSbLFX8MsFDymiTghJu/7N1Z9nY/ePklQID
+ AQABo4G0MIGxMB0GA1UdDgQWBBRa1jo5LhT5i8tbKUA76iynFS7CnDCBgQYDVR0j
+ BHoweIAUWtY6OS4U+YvLWylAO+ospxUuwpyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQC6/Aj/D0uQRDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQAx2Xfd1pfAlPepfSX4KUPbhJaq+Z2695FVOW+KqBC/L6db
+ jyUYQtoi1X9yge4FaVNt1GMMUv9XVcvH6O7UTLdXBiSXXW/BbhLzRgnf09Mtta0y
+ skCRNaStwWbIrDFRegIk0rFUya3n2oR5B5ZW0ah7C93sxYbVbSMZmVfUpf/oZY79
+ UZhImwhWAzMfvKgzPySFAXOmoShseo6hrOTyeWJgVxT4EKtifhyhdTZDkT8XykbX
+ CA34rv87jODyi+dYGhbegFiuJoDo/9/weL0BH5N48yW18sSjRkURF5VXGbPMUx96
+ 8Knhux1hK+cTlx1vIfHtJa81w/f3BtS7gweYmKp4
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID2jCCAsKgAwIBAgIJALr8CP8PS5BEMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE5WhcNMjYw
+ MzMwMTIzNzE5WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgFf2q8W/UjaWOZdNqr9EmOa
+ WG0l2hEosA+IAHcKkdBNdMhNGzED45WLadguUY1F+Irnft2DF/52/rukG/XuFkM1
+ SybLxZdme3ozG91w+TB86/BPTNOl16P2Q3QQ90FdkqZY/rWPMwIRVA5mjKuf6+1T
+ 5PL9/XpQC9JFwXmUXNsNsLJryDgm+13wugMPymrgWmFGZN2HYlSv5TF5mIxVQOYC
+ SjsGZhu88GmRjMxHN1T6OAn7a4HA7/wlEfnl8SQ5TIWPRjQukN9hg/CpYC2zI17G
+ /606x/P4lkJ37/NErZ/u4ueA4ymhyWSbLFX8MsFDymiTghJu/7N1Z9nY/ePklQID
+ AQABo4G0MIGxMB0GA1UdDgQWBBRa1jo5LhT5i8tbKUA76iynFS7CnDCBgQYDVR0j
+ BHoweIAUWtY6OS4U+YvLWylAO+ospxUuwpyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQC6/Aj/D0uQRDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQAx2Xfd1pfAlPepfSX4KUPbhJaq+Z2695FVOW+KqBC/L6db
+ jyUYQtoi1X9yge4FaVNt1GMMUv9XVcvH6O7UTLdXBiSXXW/BbhLzRgnf09Mtta0y
+ skCRNaStwWbIrDFRegIk0rFUya3n2oR5B5ZW0ah7C93sxYbVbSMZmVfUpf/oZY79
+ UZhImwhWAzMfvKgzPySFAXOmoShseo6hrOTyeWJgVxT4EKtifhyhdTZDkT8XykbX
+ CA34rv87jODyi+dYGhbegFiuJoDo/9/weL0BH5N48yW18sSjRkURF5VXGbPMUx96
+ 8Knhux1hK+cTlx1vIfHtJa81w/f3BtS7gweYmKp4
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.stir.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Stirling</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..2147a82b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ulster.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "Test Unidesk - Ulster" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:26:12Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJALiPkubf7TWHMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1M1oX
+ DTI2MDMzMDEyMzc1M1owVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq3M/LdSd+6HtG
+ rsrULUV6WFiGMUdJqrto2MjG/MwjQGIDBr+5RLXKcD8CvgMbzTylSvuMZKwJLmUr
+ 7ycjkbj42BmzNneWv08cFc8OilqVfKv1V5DwKnnwLyc9xCEQiTxFIanaxSQQlSz3
+ +BBUQz8vFztolXTYh/mswJkwBAfUSuJi01YO5AgT1Nz1UxevVWj5e9v3zvgrdTg0
+ 9Jr+Dj1LvlHsplD8jRy9vjLKtpshATioNebMuhUbprWEC2PLy/+Bq9HJjZgulo3r
+ s9mX7BY/5FwFL1wD3zR/3XDZrqXl72KMa/9OvNIpucwWx7H8rvIs9UriR4T62t3x
+ NXDfMNszAgMBAAGjgbgwgbUwHQYDVR0OBBYEFBKtj0q4+ZplekDXtrmSsxPwKECF
+ MIGFBgNVHSMEfjB8gBQSrY9KuPmaZXpA17a5krMT8ChAhaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQC4j5Lm3+01hzAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCGBbK+Ku25waBIn66a/9TYxow/v3sQ
+ DAtY3tqqZz1vlrf0ymHv8brMxZiaCwq3HNuQJEQpE/rgY9/w97pDVkoFq7TgSIRn
+ LmiHIztnW8RtnK80etS7tPJSV+Fes7sR/iIxXFtRY1iWXJ9CNFr6V5CUkudpvrIY
+ rYlU/r0ghRYAh6z9BeCiX1Ujx3vI3tOdG85LiaxDFBeUGq+EGZPFilMDdzCWVm92
+ y1GE4I0lT1fVZ0QQxNMz0ensIzIeh4JTgd6lbXm/l2G/NqaN3KXQ81jaahhC6omh
+ /8B1yAFVgKaK/PrHQuSpm4+zA+Qe3iFHtQ/TY3Nn2Sp3f8b/kzN4z6QI
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJALiPkubf7TWHMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1M1oX
+ DTI2MDMzMDEyMzc1M1owVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq3M/LdSd+6HtG
+ rsrULUV6WFiGMUdJqrto2MjG/MwjQGIDBr+5RLXKcD8CvgMbzTylSvuMZKwJLmUr
+ 7ycjkbj42BmzNneWv08cFc8OilqVfKv1V5DwKnnwLyc9xCEQiTxFIanaxSQQlSz3
+ +BBUQz8vFztolXTYh/mswJkwBAfUSuJi01YO5AgT1Nz1UxevVWj5e9v3zvgrdTg0
+ 9Jr+Dj1LvlHsplD8jRy9vjLKtpshATioNebMuhUbprWEC2PLy/+Bq9HJjZgulo3r
+ s9mX7BY/5FwFL1wD3zR/3XDZrqXl72KMa/9OvNIpucwWx7H8rvIs9UriR4T62t3x
+ NXDfMNszAgMBAAGjgbgwgbUwHQYDVR0OBBYEFBKtj0q4+ZplekDXtrmSsxPwKECF
+ MIGFBgNVHSMEfjB8gBQSrY9KuPmaZXpA17a5krMT8ChAhaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQC4j5Lm3+01hzAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCGBbK+Ku25waBIn66a/9TYxow/v3sQ
+ DAtY3tqqZz1vlrf0ymHv8brMxZiaCwq3HNuQJEQpE/rgY9/w97pDVkoFq7TgSIRn
+ LmiHIztnW8RtnK80etS7tPJSV+Fes7sR/iIxXFtRY1iWXJ9CNFr6V5CUkudpvrIY
+ rYlU/r0ghRYAh6z9BeCiX1Ujx3vI3tOdG85LiaxDFBeUGq+EGZPFilMDdzCWVm92
+ y1GE4I0lT1fVZ0QQxNMz0ensIzIeh4JTgd6lbXm/l2G/NqaN3KXQ81jaahhC6omh
+ /8B1yAFVgKaK/PrHQuSpm4+zA+Qe3iFHtQ/TY3Nn2Sp3f8b/kzN4z6QI
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Ulster</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..b1151546
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ulster.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "Test Unidesk - Ulster" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:25:40Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJANq1yLjymVOIMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1NFoX
+ DTI2MDMzMDEyMzc1NFowVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJI/GFDxsFAW+6
+ Ou5nagpAq1Qk5Fin2rFY9BB7RS6KLhJoSgMX7ssGNXP8HYzcISCVPNXzqbfoKvcv
+ 7grqXAA4iuhDWgAvIgxehnByEuj1TsxPb33b1ajNYDolxjJEmU51klO7NnaPRwR6
+ JJvhvzd2FzDlF9JrycTM8XbPjsTfTPXwgKfUeuxdCqlpsOb8MFyM3izEzIZkx+6N
+ bpIE+KLQZgOSchYFSaHhLqu/9TBza/J95VShgaPwQTK/yOtwTO3gX8oyOCOHzypy
+ KK8FylnsXQCp4EO6pNuN4b4VSp6OsrKdGKRU9oUamnR7qPzj4v8M+B6XU4mzMR3e
+ Z+ZbXFxPAgMBAAGjgbgwgbUwHQYDVR0OBBYEFEe6QHlpPV401yTQq07DeOkTcAw2
+ MIGFBgNVHSMEfjB8gBRHukB5aT1eNNck0KtOw3jpE3AMNqFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQDatci48plTiDAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG0pO2+nYPsZIECStWimLJK0InGvkE
+ 0AM+t6qX2+6A+eRyL6Uv6weUtM3XHXC/evNV7oy7/B8fBGHxBPpHohawBS+3EH9N
+ +TbyynfcetgpdVQJbfi5NEigG8kcakpjAKRykwjul1UdfRATEKxdwlvcrSTUZvt9
+ u21ITIDtIC6E/oRS+2PWP5XHwoebHcFvh1uAoWUscez4FFA2PK3rUpjDR7GhIQ80
+ +aFxEUr85lO9e25/1WlMNlQQCkzOHRSBKR2GXeqrfTUqeI3Ez5kumWYrmxiyXCDU
+ 76p9XQ/DN7/gOwewXYHVMmZTvRGfEeicsqCUwVFEV705uNkc9jvhifo3
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJANq1yLjymVOIMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1NFoX
+ DTI2MDMzMDEyMzc1NFowVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJI/GFDxsFAW+6
+ Ou5nagpAq1Qk5Fin2rFY9BB7RS6KLhJoSgMX7ssGNXP8HYzcISCVPNXzqbfoKvcv
+ 7grqXAA4iuhDWgAvIgxehnByEuj1TsxPb33b1ajNYDolxjJEmU51klO7NnaPRwR6
+ JJvhvzd2FzDlF9JrycTM8XbPjsTfTPXwgKfUeuxdCqlpsOb8MFyM3izEzIZkx+6N
+ bpIE+KLQZgOSchYFSaHhLqu/9TBza/J95VShgaPwQTK/yOtwTO3gX8oyOCOHzypy
+ KK8FylnsXQCp4EO6pNuN4b4VSp6OsrKdGKRU9oUamnR7qPzj4v8M+B6XU4mzMR3e
+ Z+ZbXFxPAgMBAAGjgbgwgbUwHQYDVR0OBBYEFEe6QHlpPV401yTQq07DeOkTcAw2
+ MIGFBgNVHSMEfjB8gBRHukB5aT1eNNck0KtOw3jpE3AMNqFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQDatci48plTiDAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG0pO2+nYPsZIECStWimLJK0InGvkE
+ 0AM+t6qX2+6A+eRyL6Uv6weUtM3XHXC/evNV7oy7/B8fBGHxBPpHohawBS+3EH9N
+ +TbyynfcetgpdVQJbfi5NEigG8kcakpjAKRykwjul1UdfRATEKxdwlvcrSTUZvt9
+ u21ITIDtIC6E/oRS+2PWP5XHwoebHcFvh1uAoWUscez4FFA2PK3rUpjDR7GhIQ80
+ +aFxEUr85lO9e25/1WlMNlQQCkzOHRSBKR2GXeqrfTUqeI3Ez5kumWYrmxiyXCDU
+ 76p9XQ/DN7/gOwewXYHVMmZTvRGfEeicsqCUwVFEV705uNkc9jvhifo3
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Ulster</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
index 2bac5ee5..d58e3e78 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Statistical Accounts of Scotland</mdui:DisplayName>
<mdui:Description xml:lang="en">Essential sources of the study of Scottish life in the 18th and 19th centuries</mdui:Description>
- <mdui:Logo height="119" width="350">https://vsp2.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
+ <mdui:Logo height="119" width="350">https://auth.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
index 9e334976..45ff75f2 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
@@ -9,7 +9,7 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+ <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
<mdui:DisplayName xml:lang="en">EDINA services</mdui:DisplayName>
<mdui:Description xml:lang="en">EDINA services for research and education</mdui:Description>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
deleted file mode 100644
index 82d8fe9b..00000000
--- a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:eduserv.org.uk:athens:provider:tvu.ac.uk">
- <!--
- This is a Shibboleth IdP for The University of West London.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
- aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
- oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
- BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
- jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
- RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
- VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
- ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
- SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
- DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
- BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
- HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
- TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
- Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
- dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
- 5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
- LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
- VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
- fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
- s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.tvu.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
- aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
- oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
- BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
- jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
- RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
- VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
- ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
- SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
- DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
- BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
- HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
- TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
- Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
- dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
- 5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
- LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
- VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
- fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
- s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">The University of West London</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of West London (Old)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.tvu.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Service Helpdesk</GivenName>
- <EmailAddress>mailto:itservicedesk@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Amanda</GivenName>
- <SurName>Burns</SurName>
- <EmailAddress>mailto:amanda.burns@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Vani</GivenName>
- <SurName>Aul</SurName>
- <EmailAddress>mailto:Vani.Aul@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Network Services</GivenName>
- <EmailAddress>mailto:networkservices@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Rumun</SurName>
- <EmailAddress>mailto:richard.rumun@uwl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
deleted file mode 100644
index c30ae8cb..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:musc.edu">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Medical University of South Carolina</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Medical University of South Carolina</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Richard Gadsden</md:GivenName>
- <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Joshua Staples</md:GivenName>
- <md:EmailAddress>staplesj@musc.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Shibboleth IDP Group</md:GivenName>
- <md:EmailAddress>shibidp@musc.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
index 2263d916..5b72139d 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
@@ -19,7 +19,7 @@
<mdui:Description xml:lang="en">The University of Maryland, College Park is a public research university, the flagship campus of the University System of Maryland, and the original 1862 land-grant institution in the State.</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.umd.edu</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.nethics.umd.edu/aup/</mdui:PrivacyStatementURL>
- <mdui:Logo height="61" width="61" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobesm.gif</mdui:Logo>
+ <mdui:Logo height="115" width="115" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobelg.gif</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
index a99465c7..48a5bdcd 100644
--- a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
@@ -46,28 +46,28 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vho.aaf.edu.au/idp/profile/SAML2/Redirect/SSO"/>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vho.aaf.edu.au/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au/idp/profile/SAML2/SOAP/ECP"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
</md:IDPSSODescriptor>
<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -101,28 +101,28 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">vho.aaf.edu.au</md:OrganizationName>
@@ -131,9 +131,9 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
</md:Organization>
<md:ContactPerson contactType="support">
<md:Company>Australian Access Federation</md:Company>
- <md:GivenName>Bradley</md:GivenName>
- <md:SurName>Beddoes</md:SurName>
- <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
+ <md:GivenName>AAF</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Australian Access Federation</md:Company>
@@ -144,8 +144,8 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Australian Access Federation</md:Company>
- <md:GivenName>AAF</md:GivenName>
- <md:SurName>Support</md:SurName>
- <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
+ <md:GivenName>Bradley</md:GivenName>
+ <md:SurName>Beddoes</md:SurName>
+ <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
index 04d49304..8d315ef1 100644
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -34,8 +34,8 @@
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
<md:ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</md:ServiceName>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 3f50ab60..dbb325d6 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -122,6 +122,6 @@
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
index 706c8efc..c8fba982 100644
--- a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
@@ -31,6 +31,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIJAI9De290KMmjMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+ BAMTG3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51azAeFw0xNjA0MDQxMjA0NDla
+ Fw0yNjA0MDIxMjA0NDlaMCYxJDAiBgNVBAMTG3d3dy5hdWRpb25ldHdvcmsubmVu
+ Lmdvdi51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALs1Xvl+YUxg
+ 6qrTPBEvjP6U+Xj56/NxYlBQ0MzjGNDYKOb5wybkgaZF/pcQxLlEzYGvJnYVCazq
+ puniTJlyRAvDHjWzvXb5sdahZCCvfp9Y+xHYa8UuqLxP/oWod7L2ChpL+y0vzLkn
+ yYi20IIPOQQRAr2Dq7lXG0ChHjEwNWWJl35iLVvGSLIKrkEOwHNYBstONR7t+SqW
+ YD0F5la2s7Or1F0UpQSUSXy79FzhJwkyS163ZDZoa/tvBGPrNXjMFROuGJN9lS3L
+ d95KKUP8LHSQK5oZMZw935F3ix2ngI7W/GAlt6Ti3cKDMON03cdnqDc8iyIj4Ik+
+ 1BiA6QdXoXECAwEAAaN5MHcwVgYDVR0RBE8wTYIbd3d3LmF1ZGlvbmV0d29yay5u
+ ZW4uZ292LnVrhi5odHRwczovL3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51ay9z
+ aGliYm9sZXRoMB0GA1UdDgQWBBTDPBGJEh/Z6ywq5BZ8z7RJmk1oozANBgkqhkiG
+ 9w0BAQUFAAOCAQEAeVpk8i9TSBMdQAK6VkXePV/FP3oZYisazSdX0UmizwLsCOyO
+ HXJeSjSwyZ1jnQmyF2L7uf72oBNx6FaqjoekRPFxIBnvs0wKJuLHwIH2NbgMiq+V
+ 9rLOfGYZfdn+tJAYtJGuj7LkN14u+/JlP6ym2yZOvY+N6bVg2RFFgeD71p3xTUDv
+ fGsyAXTqQEYU2CngSFCw9d6pq1BN6YwWvDE0QpX3Ls7h6kThEHtFfkDwbWyGEU4/
+ qJWu76dirfXs/94KyGifoqEnn/x6anu70lEhOelauKILot8oovzk9NgQW3r4T9rL
+ ucr/IH/AZ5ql3zVht/DYm/eSHqFItcWR9pgj3w==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfjCCA2agAwIBAgIRAPknBmCnCjGeotNVf6CLdX8wDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MTkwMDAwMDBaFw0xNjA0MTgyMzU5NTlaMEYxITAfBgNV
diff --git a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
deleted file mode 100644
index 738d5f47..00000000
--- a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.chinaclubhq.com/entity">
- <!--
- This is a Joomla idemauth 1.5.4 (based on SimpleSAMLPHP) SP for World Club HQ Ltd.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
- QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
- C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
- MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
- BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
- dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
- AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
- Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
- gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
- /SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
- OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
- 0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
- 9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
- z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
- 0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
- O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
- pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
- Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
- QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
- C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
- MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
- BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
- dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
- AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
- Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
- gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
- /SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
- OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
- 0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
- 9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
- z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
- 0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
- O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
- pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
- Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/SingleLogoutService.php"/>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/AssertionConsumerService.php" index="0"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">World Club HQ Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">World Club HQ</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ukclubhq.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Colin</GivenName>
- <SurName>Maclean</SurName>
- <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Colin</GivenName>
- <SurName>Maclean</SurName>
- <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
index 186501f6..785a6948 100644
--- a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
@@ -22,7 +22,9 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.dawsonera.com/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dawsonera.com/Shibboleth.sso/Login"/>
<idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dawsonera.com/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dawsonera.com/Shibboleth.sso/Login" index="2"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -73,6 +75,12 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dawsonera.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dawsonera.com/Shibboleth.sso/SAML/POST" index="11"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dawsonera.com/Shibboleth.sso/SAML/Artifact" index="12"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Dawson Books Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
index 47ec5750..1752cdae 100644
--- a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
+++ b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeus.grnet.gr/shibboleth">
<md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
<mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
diff --git a/swamid-logo-3.png b/swamid-logo-3.png
new file mode 100644
index 00000000..27716780
--- /dev/null
+++ b/swamid-logo-3.png
Binary files differ