summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--swamid-1.0/ab11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/ab11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/account-test.unit.liu.se.xml6
-rw-r--r--swamid-1.0/account.liu.se.xml1
-rw-r--r--swamid-1.0/account.mdh.se.xml8
-rw-r--r--swamid-1.0/accountcheckout.lnu.se.xml6
-rw-r--r--swamid-1.0/adfs01.fhs.se.xml8
-rw-r--r--swamid-1.0/akino.hh.se.xml4
-rw-r--r--swamid-1.0/aktivering.db.umu.se.xml4
-rw-r--r--swamid-1.0/alpha.kib.ki.se.xml2
-rw-r--r--swamid-1.0/amiga.kib.ki.se.xml4
-rw-r--r--swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/at11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/at11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/at11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/at11_idp-metadata.xml109
-rw-r--r--swamid-1.0/bardo.kib.ki.se.xml4
-rw-r--r--swamid-1.0/beta.augustus.se.xml2
-rw-r--r--swamid-1.0/beta.kib.ki.se.xml4
-rw-r--r--swamid-1.0/beta.lobber.se.xml20
-rw-r--r--swamid-1.0/betafoo.nordu.net-8000-saml2.xml29
-rw-r--r--swamid-1.0/betafoo.nordu.net.xml4
-rw-r--r--swamid-1.0/bhb-00.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/bhb-00.its.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/bibliometrics.ki.se.xml6
-rw-r--r--swamid-1.0/brainstorm.swami.se.xml4
-rw-r--r--swamid-1.0/cambro-test-26.umdc.umu.se.xml4
-rw-r--r--swamid-1.0/cambro-tst1.umdc.umu.se.xml4
-rw-r--r--swamid-1.0/cambro-utv1.umdc.umu.se.xml2
-rw-r--r--swamid-1.0/captivelan-test.it.su.se.xml3
-rw-r--r--swamid-1.0/captivelan.it.su.se.xml2
-rw-r--r--swamid-1.0/cbs-vylvatest.kib.ki.se.xml2
-rw-r--r--swamid-1.0/cdn.nordunet.tv.xml4
-rw-r--r--swamid-1.0/coip-test.sunet.se-sp.xml4
-rw-r--r--swamid-1.0/coip-test.sunet.se.xml51
-rw-r--r--swamid-1.0/confluence-test.it.su.se.xml4
-rw-r--r--swamid-1.0/confluence.it.su.se.xml4
-rw-r--r--swamid-1.0/connect-beta.sunet.se.xml31
-rw-r--r--swamid-1.0/connect-stable.sunet.se.xml30
-rw-r--r--swamid-1.0/connect-test.sunet.se.xml16
-rw-r--r--swamid-1.0/connect.sunet.se.xml31
-rw-r--r--swamid-1.0/connect.uninett.no.xml20
-rw-r--r--swamid-1.0/converis.info.xml6
-rw-r--r--swamid-1.0/crowd.nordu.net.xml18
-rw-r--r--swamid-1.0/crowdtest.nordu.net.xml4
-rw-r--r--swamid-1.0/dedserv79.levonline.com.xml4
-rw-r--r--swamid-1.0/dev.lobber.se.xml4
-rw-r--r--swamid-1.0/dev.teol.uu.se.xml3
-rw-r--r--swamid-1.0/download.portal.chalmers.se.xml1
-rw-r--r--swamid-1.0/downloads.channel8.msdn.com.xml83
-rw-r--r--swamid-1.0/dspace.it.su.se.xml2
-rw-r--r--swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml109
-rw-r--r--swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml109
-rw-r--r--swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/e5.onthehub.com.xml80
-rw-r--r--swamid-1.0/ecsidp.antagning.se-ecs-idp.xml138
-rw-r--r--swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml109
-rw-r--r--swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml136
-rw-r--r--swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml109
-rw-r--r--swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml109
-rw-r--r--swamid-1.0/egiswamid.egi.kth.se.xml1
-rw-r--r--swamid-1.0/ensky.lhs.se.xml2
-rw-r--r--swamid-1.0/epc.ub.uu.se.xml4
-rw-r--r--swamid-1.0/expert.antagning.se.xml2
-rw-r--r--swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/expert.testa.antagning.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/expert.testb.antagning.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/flax.nettst.chalmers.se.xml2
-rw-r--r--swamid-1.0/fordrop.irt.kth.se.xml6
-rw-r--r--swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/ft11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/ft11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/ft11_idp-metadata.xml109
-rw-r--r--swamid-1.0/gallus.scilifelab.se.xml11
-rw-r--r--swamid-1.0/graduateland.com.xml1
-rw-r--r--swamid-1.0/hbidp.hb.se.xml178
-rw-r--r--swamid-1.0/hhs_metadata.xml6
-rw-r--r--swamid-1.0/hr.su.se.xml22
-rw-r--r--swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/hubbletest.ladok.umu.se.xml4
-rw-r--r--swamid-1.0/hubbletest_idp-metadata.xml109
-rw-r--r--swamid-1.0/identity.mdh.se.xml134
-rw-r--r--swamid-1.0/idp-fre-1.eduid.se.xml51
-rw-r--r--swamid-1.0/idp-test.kau.se.xml92
-rw-r--r--swamid-1.0/idp-test.nordu.net.xml2
-rw-r--r--swamid-1.0/idp.bth.se.xml108
-rw-r--r--swamid-1.0/idp.chalmers.se.xml4
-rw-r--r--swamid-1.0/idp.hgo.se.xml111
-rw-r--r--swamid-1.0/idp.hig.se.xml116
-rw-r--r--swamid-1.0/idp.his.se.xml107
-rw-r--r--swamid-1.0/idp.hkr.se.xml94
-rw-r--r--swamid-1.0/idp.irf.se.xml109
-rw-r--r--swamid-1.0/idp.it.gu.se.xml133
-rw-r--r--swamid-1.0/idp.it.su.se.xml18
-rw-r--r--swamid-1.0/idp.kau.se-saml2.xml8
-rw-r--r--swamid-1.0/idp.kau.se.xml6
-rw-r--r--swamid-1.0/idp.lhs.se.xml2
-rw-r--r--swamid-1.0/idp.lnu.se.xml132
-rw-r--r--swamid-1.0/idp.mah.se.xml112
-rw-r--r--swamid-1.0/idp.nordu.net.xml2
-rw-r--r--swamid-1.0/idp.secure.su.se.xml6
-rw-r--r--swamid-1.0/idp.student.bth.se.xml111
-rw-r--r--swamid-1.0/idp.suni.se.xml7
-rw-r--r--swamid-1.0/idp.test.umu.se.xml2
-rw-r--r--swamid-1.0/idp.umu.se-saml1.xml10
-rw-r--r--swamid-1.0/idp.umu.se-saml2.xml12
-rw-r--r--swamid-1.0/idp1.irf.se.xml111
-rw-r--r--swamid-1.0/idp1.unit.liu.se.xml108
-rw-r--r--swamid-1.0/idp2.hig.se.xml123
-rw-r--r--swamid-1.0/idp2.hv.se.xml150
-rw-r--r--swamid-1.0/idp2.kau.se.xml4
-rw-r--r--swamid-1.0/idptest.test.it.gu.se.xml109
-rw-r--r--swamid-1.0/iidp3.hv.se.xml150
-rw-r--r--swamid-1.0/ilearn.dsv.su.se.xml6
-rw-r--r--swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/it11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/it11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/it11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/it11_idp-metadata.xml109
-rw-r--r--swamid-1.0/its-pd0001.ad.umu.se.xml3
-rw-r--r--swamid-1.0/its-pd0030.ad.umu.se.xml3
-rw-r--r--swamid-1.0/its-pd0062.ad.umu.se.xml4
-rw-r--r--swamid-1.0/jabber.nordu.net.xml17
-rw-r--r--swamid-1.0/jira-test.it.su.se.xml4
-rw-r--r--swamid-1.0/jira.it.su.se.xml4
-rw-r--r--swamid-1.0/kib.ki.se.xml6
-rw-r--r--swamid-1.0/kiidp.ki.se.xml108
-rw-r--r--swamid-1.0/kiladokdev.it.ki.se.xml4
-rw-r--r--swamid-1.0/kiladoktest.it.ki.se.xml4
-rw-r--r--swamid-1.0/kilwdev.it.ki.se.xml3
-rw-r--r--swamid-1.0/kurser.math.su.se.xml6
-rw-r--r--swamid-1.0/kurser3.math.su.se.xml6
-rw-r--r--swamid-1.0/labs.swami.se.xml2
-rw-r--r--swamid-1.0/ladok-test.su.se.xml4
-rw-r--r--swamid-1.0/ladok.su.se.xml4
-rw-r--r--swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/ladok3test.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-1.0/ladok3test.its.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/lingon.ladok.umu.se.xml111
-rw-r--r--swamid-1.0/lists.su.se.xml2
-rw-r--r--swamid-1.0/livesrv.ex.vr.se.xml114
-rw-r--r--swamid-1.0/login-dev.du.se.xml112
-rw-r--r--swamid-1.0/login.du.se.xml10
-rw-r--r--swamid-1.0/login.liu.se.xml139
-rw-r--r--swamid-1.0/login.proxy.kib.ki.se.xml4
-rw-r--r--swamid-1.0/lpw.ki.se.xml3
-rw-r--r--swamid-1.0/lpwdev.it.ki.se.xml3
-rw-r--r--swamid-1.0/luigi.umdc.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/luigi.umdc.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/mail.su.se.xml6
-rw-r--r--swamid-1.0/mailfilter-test.nordu.net.xml4
-rw-r--r--swamid-1.0/mailfilter.nordu.net.xml13
-rw-r--r--swamid-1.0/mailfilter.sunet.se.xml13
-rw-r--r--swamid-1.0/mds-test.sunet.se.xml4
-rw-r--r--swamid-1.0/mds.lan.kth.se.xml4
-rw-r--r--swamid-1.0/mds.sunet.se.xml4
-rw-r--r--swamid-1.0/mds2.nordu.net.xml4
-rw-r--r--swamid-1.0/medieportaltest.kau.se.xml4
-rw-r--r--swamid-1.0/meetingtools.nordu.net.xml15
-rw-r--r--swamid-1.0/meta.eduroam.se.xml4
-rw-r--r--swamid-1.0/minastudier-test.su.se.xml6
-rw-r--r--swamid-1.0/minastudier.ladok.umu.se-user-idp.xml109
-rw-r--r--swamid-1.0/minastudier.ladok.umu.se.xml4
-rw-r--r--swamid-1.0/minastudier.su.se.xml6
-rw-r--r--swamid-1.0/mondo-test.su.se.xml4
-rw-r--r--swamid-1.0/mondo-web.it.su.se.xml2
-rw-r--r--swamid-1.0/mondo.su.se.xml4
-rw-r--r--swamid-1.0/monitor.it.su.se.xml4
-rw-r--r--swamid-1.0/moodle.lhs.se.xml2
-rw-r--r--swamid-1.0/nacho.adm.gu.se.xml4
-rw-r--r--swamid-1.0/nagios-vm.nordu.net.xml4
-rw-r--r--swamid-1.0/nagios.dev.it.su.se.xml4
-rw-r--r--swamid-1.0/nagios.nordu.net.xml3
-rw-r--r--swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nb11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nb11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nb11_idp-metadata.xml109
-rw-r--r--swamid-1.0/ni.nordu.net-pysaml2.xml40
-rw-r--r--swamid-1.0/ni.nordu.net.xml4
-rw-r--r--swamid-1.0/nordunet.tv.xml17
-rw-r--r--swamid-1.0/nordushare-dev.nordu.net.xml6
-rw-r--r--swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-00_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-01_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-02_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-03_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-04_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-05_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-06_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-07_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-08_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-09_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-10_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-11_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-12_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-13_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-14_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-15_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-16_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-17_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-18_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-19_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-20_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-21_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-22_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-23_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-24_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-25_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-26_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-27_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-28_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-29_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/nya-30_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-31_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-32_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-33.ladok.umu.se.xml109
-rw-r--r--swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-34_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-35_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-36_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-37_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-38_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-39_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-40_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-41_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-42_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-43_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-44_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-45_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-46_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-47_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-48_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-49_idp-metadata.xml109
-rw-r--r--swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml109
-rw-r--r--swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/nya-50_idp-metadata.xml109
-rw-r--r--swamid-1.0/nyainloggning.slu.se.xml4
-rw-r--r--swamid-1.0/nyautb_idp-metadata.xml109
-rw-r--r--swamid-1.0/openidp.feide.no.xml8
-rw-r--r--swamid-1.0/order.kib.ki.se.xml4
-rw-r--r--swamid-1.0/pingpong.chalmers.se.xml2
-rw-r--r--swamid-1.0/play.hb.se.xml4
-rw-r--r--swamid-1.0/play.hig.se.xml4
-rw-r--r--swamid-1.0/play.liu.se.xml4
-rw-r--r--swamid-1.0/play.lu.se.xml4
-rw-r--r--swamid-1.0/play.mah.se.xml4
-rw-r--r--swamid-1.0/play.mdh.se.xml4
-rw-r--r--swamid-1.0/play.sunet.se.xml4
-rw-r--r--swamid-1.0/portal.mdh.se.xml3
-rw-r--r--swamid-1.0/portalservicesutv.miun.se.xml3
-rw-r--r--swamid-1.0/pp-edu-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/pp-komm-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/pp-migr-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/pp-prod-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/pp-redmigr-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/pp-redtest-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/pp-test-admin.it.su.se.xml6
-rw-r--r--swamid-1.0/public.it.secure.su.se.xml2
-rw-r--r--swamid-1.0/publications.ki.se.xml6
-rw-r--r--swamid-1.0/referens-idp.skolfederation.se.xml92
-rw-r--r--swamid-1.0/registrera.hb.se.xml4
-rw-r--r--swamid-1.0/roundup.it.su.se.xml2
-rw-r--r--swamid-1.0/rt-test-app1.it.su.se.xml4
-rw-r--r--swamid-1.0/rt.it.su.se.xml3
-rw-r--r--swamid-1.0/samadhi.kib.ki.se.xml6
-rw-r--r--swamid-1.0/saml-1.sys.kth.se.xml4
-rw-r--r--swamid-1.0/samsok.libris.kb.se.xml2
-rw-r--r--swamid-1.0/shib-1-r.referens.sys.kth.se.xml112
-rw-r--r--swamid-1.0/shib-idp-1.oru.se.xml17
-rw-r--r--swamid-1.0/shib-idp-test.oru.se.xml109
-rw-r--r--swamid-1.0/shib-sp-test.oru.se.xml6
-rw-r--r--swamid-1.0/shib-sp.kau.se.xml2
-rw-r--r--swamid-1.0/shib1.oru.se.xml4
-rw-r--r--swamid-1.0/shibb1.hj.se.xml134
-rw-r--r--swamid-1.0/shibbo-test.ltu.se.xml111
-rw-r--r--swamid-1.0/shibbo.ltu.se.xml110
-rw-r--r--swamid-1.0/shibboleth.ebscohost.com.xml3
-rw-r--r--swamid-1.0/shibboleth.net.lu.se.xml108
-rw-r--r--swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/shibboleth.slu.se.xml6
-rw-r--r--swamid-1.0/shibboleth.sys.kth.se.xml2
-rw-r--r--swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml109
-rw-r--r--swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml109
-rw-r--r--[-rwxr-xr-x]swamid-1.0/shibboleth.vhs.se.xml110
-rw-r--r--swamid-1.0/signon.hh.se.xml110
-rw-r--r--swamid-1.0/slcstest.uninett.no.xml2
-rw-r--r--swamid-1.0/smd-dev.nordu.net.xml4
-rw-r--r--swamid-1.0/smd.du.se.xml4
-rw-r--r--swamid-1.0/smultron.catalogix.se.xml26
-rw-r--r--swamid-1.0/sp-nya.bth.se.xml6
-rw-r--r--swamid-1.0/sp-test.it.su.se.xml4
-rw-r--r--swamid-1.0/sp-test.swamid.se.xml15
-rw-r--r--swamid-1.0/sp.it.gu.se.xml4
-rw-r--r--swamid-1.0/sp.kau.se.xml4
-rw-r--r--swamid-1.0/sp.lhs.se.xml2
-rw-r--r--swamid-1.0/sp.swamid.se.xml22
-rw-r--r--swamid-1.0/sp.wavelan.su.se.xml6
-rw-r--r--swamid-1.0/staging.dreamspark.com.xml9
-rw-r--r--swamid-1.0/su.avedas.com.xml4
-rw-r--r--swamid-1.0/sutest.dsv.su.se.xml4
-rw-r--r--swamid-1.0/swamid.shh.se.xml106
-rw-r--r--swamid-1.0/swamid.user.uu.se.xml172
-rw-r--r--swamid-1.0/tcs-escience-portal.terena.org.xml1
-rw-r--r--swamid-1.0/tcs-escience.sunet.se.xml3
-rw-r--r--swamid-1.0/tcs-personal-portal.terena.org.xml1
-rw-r--r--swamid-1.0/tcs-personal.sunet.se.xml3
-rw-r--r--swamid-1.0/tcs-test.sunet.se.xml6
-rw-r--r--swamid-1.0/test-chalmers.pingpong.net.xml3
-rw-r--r--swamid-1.0/test-ki.pingpong.net.xml3
-rw-r--r--swamid-1.0/testakt.it.ki.se.xml4
-rw-r--r--swamid-1.0/testgag.it.ki.se.xml4
-rw-r--r--swamid-1.0/testshib.user.uu.se.xml109
-rw-r--r--swamid-1.0/tools.sunet.se.xml6
-rw-r--r--swamid-1.0/umdac-humpdac.ad.umu.se.xml2
-rw-r--r--swamid-1.0/umdac-olho0001.ad.umu.se.xml2
-rw-r--r--swamid-1.0/umdac-stdout.umdc.umu.se.xml4
-rw-r--r--swamid-1.0/umdac-strike.ad.umu.se.xml4
-rw-r--r--swamid-1.0/umdac-utv1.ad.umu.se.xml4
-rw-r--r--swamid-1.0/umdac-utv2.ad.umu.se.xml4
-rw-r--r--swamid-1.0/unitcf.se.xml4
-rw-r--r--swamid-1.0/uu.test.diva-portal.org.xml6
-rw-r--r--swamid-1.0/vfu-gemdev.it.su.se.xml4
-rw-r--r--swamid-1.0/vfu-test.su.se.xml4
-rw-r--r--swamid-1.0/vfu.su.se.xml4
-rw-r--r--swamid-1.0/vlab-chemsub.explizit.se.xml4
-rw-r--r--swamid-1.0/vmfront.lan.kth.se.xml4
-rw-r--r--swamid-1.0/vmidgw3.miun.se.xml91
-rw-r--r--swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/wb11.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/wb11.ladok.umu.se-dw-idp.xml92
-rw-r--r--swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml92
-rw-r--r--swamid-1.0/wb11_idp-metadata.xml109
-rw-r--r--swamid-1.0/webapp-utv.ita.mdh.se.xml3
-rw-r--r--swamid-1.0/webwork.math.su.se.xml2
-rw-r--r--swamid-1.0/webwork2.math.su.se.xml2
-rw-r--r--swamid-1.0/ws3.bmc.uu.se.xml4
-rw-r--r--swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml4
-rw-r--r--swamid-1.0/www.antagning.se-aws-sp.xml2
-rw-r--r--swamid-1.0/www.antagning.testa.antagning.se-ecs-sp.xml2
-rw-r--r--swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml4
-rw-r--r--swamid-1.0/www.bmcmediatek.uu.se.xml4
-rw-r--r--swamid-1.0/www.cambro.umu.se.xml4
-rw-r--r--swamid-1.0/www.diva-portal.org.xml21
-rw-r--r--swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.play.umu.se.xml4
-rw-r--r--swamid-1.0/www.servicedesk.its.umu.se.xml3
-rw-r--r--swamid-1.0/www.student.teol.uu.se.xml3
-rw-r--r--swamid-1.0/www.studera.nu.xml4
-rw-r--r--swamid-1.0/www.studera.testb.antagning.se.xml4
-rw-r--r--swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.sub.su.se.xml2
-rw-r--r--swamid-1.0/www.testa.antagning.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.testa.universityadmissions.se.xml4
-rw-r--r--swamid-1.0/www.testb.antagning.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml2
-rw-r--r--swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml4
-rw-r--r--swamid-1.0/www.universityadmissions.se-aws-sp-en.xml2
-rw-r--r--swamid-1.0/www.wisum.its.umu.se.xml3
-rw-r--r--swamid-1.0/www.wisum.umdac.umu.se.xml4
-rw-r--r--swamid-1.0/www07test.sub.su.se.xml4
-rw-r--r--swamid-1.0/www2.student.teol.uu.se.xml3
-rw-r--r--swamid-1.0/www2.teol.uu.se.xml3
-rw-r--r--swamid-1.0/www3.genuinetext.com.xml2
-rw-r--r--swamid-1.0/www4.genuinetext.com.xml4
-rw-r--r--swamid-1.0/xfire.mimas.ac.uk.xml2
-rw-r--r--swamid-2.0/akka-anv.uu.se.xml14
-rw-r--r--swamid-2.0/akkatest.its.uu.se.xml2
-rw-r--r--swamid-2.0/aktivera.ki.se-shibboleth.xml7
-rw-r--r--swamid-2.0/artisan-idp.sunet.se.xml15
-rw-r--r--swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml5
-rw-r--r--swamid-2.0/box-idp.sunet.se-idp.xml6
-rw-r--r--swamid-2.0/box-idp.sunet.se.xml15
-rw-r--r--swamid-2.0/box.net.xml2
-rw-r--r--swamid-2.0/ci.nordu.net.xml3
-rw-r--r--swamid-2.0/coip.app.nordu.net.xml40
-rw-r--r--swamid-2.0/connect.funet.fi.xml19
-rw-r--r--swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml6
-rw-r--r--swamid-2.0/e5.onthehub.com.xml13
-rw-r--r--swamid-2.0/fs.liu.se.xml6
-rw-r--r--swamid-2.0/gidp.geant.net-sp.xml1
-rw-r--r--swamid-2.0/hades.slu.se.xml1
-rw-r--r--swamid-2.0/idp-test.nordu.net-sp.xml15
-rw-r--r--swamid-2.0/idp-test.nordu.net-ssp-idp.xml6
-rw-r--r--swamid-2.0/idp.kb.se.xml107
-rw-r--r--swamid-2.0/idp2-1.slu.se.xml1
-rw-r--r--swamid-2.0/idp2-test.slu.se.xml61
-rw-r--r--swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml14
-rw-r--r--swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml4
-rw-r--r--swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/ladok3test.its.umu.se-gui-sp.xml2
-rw-r--r--swamid-2.0/maps.slu.se.xml3
-rw-r--r--swamid-2.0/mynetworkglobal.com.xml1
-rw-r--r--swamid-2.0/portalservices.miun.se-shibboleth.xml4
-rw-r--r--swamid-2.0/problem.math.su.se-shilsbboleth.xml28
-rw-r--r--swamid-2.0/rems.csc.fi.xml149
-rw-r--r--swamid-2.0/secure.urkund.com.xml13
-rw-r--r--swamid-2.0/services.ibistic.net.xml2
-rw-r--r--swamid-2.0/sgw.africa-grid.org.xml58
-rw-r--r--swamid-2.0/shibboleth.turnitin.com.xml4
-rw-r--r--swamid-2.0/shibdev.rsc.org.xml3
-rw-r--r--swamid-2.0/testshib.msacademicverify.com.xml9
-rw-r--r--swamid-2.0/ugit.se.xml12
-rw-r--r--swamid-2.0/uninett-box-idp.nordu.net-idp.xml6
-rw-r--r--swamid-2.0/uninett-box-idp.nordu.net.xml19
-rw-r--r--swamid-2.0/uraccess.se.xml12
-rw-r--r--swamid-2.0/webinar.nordu.net.xml17
-rw-r--r--swamid-2.0/wp.nordu.net.xml1
-rw-r--r--swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml5
-rw-r--r--swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml5
-rw-r--r--swamid-2.0/www.akademiskahogtider.se.xml15
-rw-r--r--swamid-2.0/www.ifmsa.se.xml14
-rw-r--r--swamid-2.0/www.mit.ladok.se-gui-sp.xml5
-rw-r--r--swamid-sp-2.0.mxml9
729 files changed, 10821 insertions, 17804 deletions
diff --git a/Makefile b/Makefile
index f516f7e8..a86697e2 100644
--- a/Makefile
+++ b/Makefile
@@ -134,9 +134,17 @@ swamid-ki-sll:
test: swamid2-deps
@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x 2>&1 ; done | sed 's/fails to validate/&/;s/validates/&/'
+ @for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x > /dev/null 2>&1 || exit 1 ; done
clean:
@rm -f *.xml *.tbs *.n
tidy:
@for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done
+
+commit: tidy test
+ @echo ; echo -n "Run 'git commit -a'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
+ @git commit -a
+ @echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
+ @git push
+
diff --git a/swamid-1.0/ab11.ladok.umu.se-aws-sp.xml b/swamid-1.0/ab11.ladok.umu.se-aws-sp.xml
index fd2f2918..4ed32872 100644
--- a/swamid-1.0/ab11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/ab11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml b/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
index 153c5d71..44809ae2 100644
--- a/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml
index 4d4ef221..d02ad98d 100644
--- a/swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
index 5f711448..6e92fe4c 100644
--- a/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/account-test.unit.liu.se.xml b/swamid-1.0/account-test.unit.liu.se.xml
index b37115d6..203c84e4 100644
--- a/swamid-1.0/account-test.unit.liu.se.xml
+++ b/swamid-1.0/account-test.unit.liu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account-test.unit.liu.se/shibboleth-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -67,5 +66,4 @@ fiiVqOsqvroKvOIwKEjtUzxaFg2kDWlXia4AQctOto28G9ftYkXqGxPFgA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/account.liu.se.xml b/swamid-1.0/account.liu.se.xml
index 56763b36..2b269277 100644
--- a/swamid-1.0/account.liu.se.xml
+++ b/swamid-1.0/account.liu.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://account.liu.se/shibboleth-sp">
<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:KeyDescriptor use="signing">
diff --git a/swamid-1.0/account.mdh.se.xml b/swamid-1.0/account.mdh.se.xml
index 48ba9d01..d5233268 100644
--- a/swamid-1.0/account.mdh.se.xml
+++ b/swamid-1.0/account.mdh.se.xml
@@ -1,23 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account.mdh.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://account.mdh.se/Shibboleth.sso/DS" index="1"/>
-
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
-
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Kontoaktivering Mälardalens högskola</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Account activation Mälardalen University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Mälardalens högskola</mdui:Description>
<mdui:Description xml:lang="en">Account activation service for Mälardalen University</mdui:Description>
</mdui:UIInfo>
-
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/accountcheckout.lnu.se.xml b/swamid-1.0/accountcheckout.lnu.se.xml
index e5cc54c3..3bd85b37 100644
--- a/swamid-1.0/accountcheckout.lnu.se.xml
+++ b/swamid-1.0/accountcheckout.lnu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accountcheckout.lnu.se">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -159,5 +158,4 @@ maXqnnuXmI+3zyKcs7hd5akzF3TGlzcPtOkmgl9hCz8ePWTpK5s=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accountcheckout.lnu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accountcheckout.lnu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/adfs01.fhs.se.xml b/swamid-1.0/adfs01.fhs.se.xml
index bf6c5e22..12076db4 100644
--- a/swamid-1.0/adfs01.fhs.se.xml
+++ b/swamid-1.0/adfs01.fhs.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs01.fhs.se/adfs/services/trust">
<Extensions>
<shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
@@ -53,13 +53,13 @@
<Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
</IDPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="sv-SE">F&#xF6;rsvarsh&#xF6;gskolan</OrganizationName>
- <OrganizationDisplayName xml:lang="sv-SE">F&#xF6;rsvarsh&#xF6;gskolan</OrganizationDisplayName>
+ <OrganizationName xml:lang="sv-SE">Försvarshögskolan</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv-SE">Försvarshögskolan</OrganizationDisplayName>
<OrganizationURL xml:lang="sv-SE">http://www.fhs.se/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Alex</GivenName>
- <SurName>Sj&#xF6;blom</SurName>
+ <SurName>Sjöblom</SurName>
<EmailAddress>helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46(0)855342545</TelephoneNumber>
</ContactPerson>
diff --git a/swamid-1.0/akino.hh.se.xml b/swamid-1.0/akino.hh.se.xml
index fe86c5c5..232c0992 100644
--- a/swamid-1.0/akino.hh.se.xml
+++ b/swamid-1.0/akino.hh.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://akino.hh.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,5 +67,4 @@ s2ozMUSsHZxcwpFZ7NQ4lLsgm9VihBDXZ4mTXQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akino.hh.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akino.hh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/aktivering.db.umu.se.xml b/swamid-1.0/aktivering.db.umu.se.xml
index 7916f99e..67e6f1a7 100644
--- a/swamid-1.0/aktivering.db.umu.se.xml
+++ b/swamid-1.0/aktivering.db.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aktivering.db.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aktivering.db.umu.se/Shibboleth.sso/DS" index="1"/>
@@ -95,5 +94,4 @@ LBQ+1+ysE+ryWjMO23qmJzxA8uVHHuiD30S2XHSsfL1clX20G2Zb5YAM6h/lZnGS
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivering.db.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/alpha.kib.ki.se.xml b/swamid-1.0/alpha.kib.ki.se.xml
index 4fb9d6f3..7b2a61d1 100644
--- a/swamid-1.0/alpha.kib.ki.se.xml
+++ b/swamid-1.0/alpha.kib.ki.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://alpha.kib.ki.se/shibboleth">
<md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:KeyDescriptor use="signing">
@@ -85,5 +86,4 @@ uX4aWLHHp/MpbOpwCAVWQDlPdXYS
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/amiga.kib.ki.se.xml b/swamid-1.0/amiga.kib.ki.se.xml
index 449a36fe..95c70064 100644
--- a/swamid-1.0/amiga.kib.ki.se.xml
+++ b/swamid-1.0/amiga.kib.ki.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://amiga.kib.ki.se/shibboleth">
-
<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://amiga.kib.ki.se/Shibboleth.sso/Login"/>
@@ -42,5 +41,4 @@ PHvIC/GJm2biV6LD6eLIriuNXZ5mcocCsCScdEpNLUp2+0+V+tE3Vj1c1jKmfA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml
index dfd0b88d..c1ba137e 100644
--- a/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/aws-sp-en">
-
<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://at11.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ uU3VreB64f1jHCu5pVXj76xsngziC8kHMWeZlGMsJJtmY1zNaGMFuut9Aa+EF1Y8
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-aws-sp.xml b/swamid-1.0/at11.ladok.umu.se-aws-sp.xml
index 60c54e70..c25d80fd 100644
--- a/swamid-1.0/at11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/at11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-dw-idp.xml b/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
index 12279cd4..d8ab977f 100644
--- a/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/at11.ladok.umu.se-ecs-sp.xml
index 0a0f39ae..ca3f4a43 100644
--- a/swamid-1.0/at11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/at11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
index 92bf8bf0..88e5d569 100644
--- a/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/at11_idp-metadata.xml b/swamid-1.0/at11_idp-metadata.xml
index 17b753bd..259c96c3 100644
--- a/swamid-1.0/at11_idp-metadata.xml
+++ b/swamid-1.0/at11_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://at11.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAPduxdjJbDBGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmF0ikJUxhbUg2KfwoygOHjDRaGuRs2wqlumyiO8aIJHIDKUpLZdJsKyyPZa1QMgEf1a9tRGIXvNEiaSyls6ACwIDAQABo30wezAdBgNVHQ4EFgQUvoJSh0zbgnkPcoYySWKrjdeMHUwwTAYDVR0jBEUwQ4AUvoJSh0zbgnkPcoYySWKrjdeMHUyhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA927F2MlsMEYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJQ2pDCbf/jVgAO+gMhtDELqeAZo4Rk6Zn+U7YIXvoY6S8oq7hdP8p8T9MFUoiVcIIiT5/vfcDr61o17ffWKxtI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://at11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://at11.ladok.umu.se:8452/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://at11.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8452/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://at11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAPduxdjJbDBGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmF0ikJUxhbUg2KfwoygOHjDRaGuRs2wqlumyiO8aIJHIDKUpLZdJsKyyPZa1QMgEf1a9tRGIXvNEiaSyls6ACwIDAQABo30wezAdBgNVHQ4EFgQUvoJSh0zbgnkPcoYySWKrjdeMHUwwTAYDVR0jBEUwQ4AUvoJSh0zbgnkPcoYySWKrjdeMHUyhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA927F2MlsMEYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJQ2pDCbf/jVgAO+gMhtDELqeAZo4Rk6Zn+U7YIXvoY6S8oq7hdP8p8T9MFUoiVcIIiT5/vfcDr61o17ffWKxtI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://at11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://at11.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/bardo.kib.ki.se.xml b/swamid-1.0/bardo.kib.ki.se.xml
index 59ba3630..26826491 100644
--- a/swamid-1.0/bardo.kib.ki.se.xml
+++ b/swamid-1.0/bardo.kib.ki.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bardo.kib.ki.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -84,5 +83,4 @@ HVVQRnTpfX0jh7zIizoQL7IjwaYgz7X3qCu2b3JjZdz6gsuKNA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/beta.augustus.se.xml b/swamid-1.0/beta.augustus.se.xml
index 0e08e30d..3c212f97 100644
--- a/swamid-1.0/beta.augustus.se.xml
+++ b/swamid-1.0/beta.augustus.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.augustus.se">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/beta.kib.ki.se.xml b/swamid-1.0/beta.kib.ki.se.xml
index aa0fc39b..8e672714 100644
--- a/swamid-1.0/beta.kib.ki.se.xml
+++ b/swamid-1.0/beta.kib.ki.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.kib.ki.se/shibboleth">
-
<md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -67,5 +66,4 @@ aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/beta.lobber.se.xml b/swamid-1.0/beta.lobber.se.xml
index 26a1f2ed..7ec7370e 100644
--- a/swamid-1.0/beta.lobber.se.xml
+++ b/swamid-1.0/beta.lobber.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.lobber.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beta.lobber.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -76,15 +75,14 @@ D46Wa7GYLUVqlWdkWDHBznr4QA4MRxhJDOsm9aVVDq4yAOwCQrHdY+xDokcx4mdN
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.lobber.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.lobber.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SUNET Lobber (BETA)</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SUNET Lobber (BETA) - a BitTorrent data distribution service</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7"/>
+ <md:ServiceName xml:lang="en">SUNET Lobber (BETA)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET Lobber (BETA) - a BitTorrent data distribution service</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/betafoo.nordu.net-8000-saml2.xml b/swamid-1.0/betafoo.nordu.net-8000-saml2.xml
index b5e2b589..c44cf9ed 100644
--- a/swamid-1.0/betafoo.nordu.net-8000-saml2.xml
+++ b/swamid-1.0/betafoo.nordu.net-8000-saml2.xml
@@ -1,5 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<md:EntityDescriptor entityID="https://betafoo.nordu.net/saml2/metadata/" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAMvFLpEMEvybMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://betafoo.nordu.net/saml2/metadata/">
+ <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAMvFLpEMEvybMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
BAMTB2JldGFmb28wHhcNMTIwMTIzMTMwNzAwWhcNMjIwMTIwMTMwNzAwWjASMRAw
DgYDVQQDEwdiZXRhZm9vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
n96BBnx0AbGpOlFnSJB2OM5eq/7nzzUx/lwfXIUxolYmz3m7QD16V6+wSRaVvK9R
@@ -15,4 +20,22 @@ rdb+7oWy5pHdpXWEY3gD+Vod7aHJ2g8fQ70l+nqHmh5pFTzqb3dnh8Dbn9M8cG0F
FqI3Il3tF2U+FgOT+nizupQelaoagRNerw3p2FHEYeBaTCYiW3IF7lUMIjoX2MYI
9P5iyOC2nGSq2vAzarevECtjw7KtKuX4K37LIEB5r07NXCPlfgTzHq1KomrY5Lhm
91krk/l5w5Ayt90FuWQbAA==
-</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://betafoo.nordu.net/saml2/ls/" /><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://betafoo.nordu.net/saml2/acs/" index="1" /><md:AttributeConsumingService index="1"><md:ServiceName xml:lang="en">Federated Django sample SP</md:ServiceName><md:RequestedAttribute FriendlyName="uid" Name="0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" /></md:AttributeConsumingService></md:SPSSODescriptor><md:ContactPerson contactType="technical"><md:Company>NORDUnet A/S</md:Company><md:GivenName>Johan</md:GivenName><md:SurName>Lundberg</md:SurName><md:EmailAddress>lundberg@nordu.net</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://betafoo.nordu.net/saml2/ls/"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://betafoo.nordu.net/saml2/acs/" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Federated Django sample SP</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="uid" Name="0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:Company>NORDUnet A/S</md:Company>
+ <md:GivenName>Johan</md:GivenName>
+ <md:SurName>Lundberg</md:SurName>
+ <md:EmailAddress>lundberg@nordu.net</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-1.0/betafoo.nordu.net.xml b/swamid-1.0/betafoo.nordu.net.xml
index c2180a2e..f8eff970 100644
--- a/swamid-1.0/betafoo.nordu.net.xml
+++ b/swamid-1.0/betafoo.nordu.net.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://betafoo.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://betafoo.nordu.net/Shibboleth.sso/DS" index="1"/>
@@ -71,5 +70,4 @@ GZGPT3vTvdtiWRSFXtRKzHR9LN6ZLEnVcXPKm6vWquMarXlNnQLdGVikISOjSA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://betafoo.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://betafoo.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/bhb-00.its.umu.se-gui-sp.xml b/swamid-1.0/bhb-00.its.umu.se-gui-sp.xml
index 7ea45e75..6bd66c65 100644
--- a/swamid-1.0/bhb-00.its.umu.se-gui-sp.xml
+++ b/swamid-1.0/bhb-00.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bhb-00.its.umu.se/gui-sp">
-
<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://bhb-00.its.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ T4JmWVuahf55521sNRWAb9Sx/6dKHVzXgLLg7EsJVAA=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/bhb-00.its.umu.se-user-idp.xml b/swamid-1.0/bhb-00.its.umu.se-user-idp.xml
index 68d085c5..306fb556 100644
--- a/swamid-1.0/bhb-00.its.umu.se-user-idp.xml
+++ b/swamid-1.0/bhb-00.its.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://bhb-00.its.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">bhb.its.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://bhb-00.its.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">bhb.its.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBgTCCASugAwIBAgIJANmK5d7szq6eMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWJoYi0wMC5pdHMudW11LnNlMB4XDTEyMTEyMzA3MjgzMVoXDTIyMTEyMTA3MjgzMVowHDEaMBgGA1UEAwwRYmhiLTAwLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAx6lDKSbXwgN19SARCQMM/tvzEqP6QSGFccv0rgw6ef8aKVp52lTAoB05bXiZHXCsZsasE9GtPkyuMx2S7bscFQIDAQABo1AwTjAdBgNVHQ4EFgQUtoJkLhWFVGovAl8MZfjyooPm0EUwHwYDVR0jBBgwFoAUtoJkLhWFVGovAl8MZfjyooPm0EUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJubaw1VrzPRgRBYapaY7mbIHwxzRuCislNOXB39Xv7y3qgUaT0jh3khqZiZMkrnT8YB0j4+CsmOfKl8Xtpqiyc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://bhb-00.its.umu.se:8445/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://bhb-00.its.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">bhb.its.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se:8445/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://bhb-00.its.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">bhb.its.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBgTCCASugAwIBAgIJANmK5d7szq6eMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWJoYi0wMC5pdHMudW11LnNlMB4XDTEyMTEyMzA3MjgzMVoXDTIyMTEyMTA3MjgzMVowHDEaMBgGA1UEAwwRYmhiLTAwLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAx6lDKSbXwgN19SARCQMM/tvzEqP6QSGFccv0rgw6ef8aKVp52lTAoB05bXiZHXCsZsasE9GtPkyuMx2S7bscFQIDAQABo1AwTjAdBgNVHQ4EFgQUtoJkLhWFVGovAl8MZfjyooPm0EUwHwYDVR0jBBgwFoAUtoJkLhWFVGovAl8MZfjyooPm0EUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJubaw1VrzPRgRBYapaY7mbIHwxzRuCislNOXB39Xv7y3qgUaT0jh3khqZiZMkrnT8YB0j4+CsmOfKl8Xtpqiyc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://bhb-00.its.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/bibliometrics.ki.se.xml b/swamid-1.0/bibliometrics.ki.se.xml
index 35aeb853..7f6063e4 100644
--- a/swamid-1.0/bibliometrics.ki.se.xml
+++ b/swamid-1.0/bibliometrics.ki.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bibliometrics.ki.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -75,5 +74,4 @@ fP+xp1jCheyR/F9V3w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bibliometrics.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/brainstorm.swami.se.xml b/swamid-1.0/brainstorm.swami.se.xml
index a9d13877..a9a69e42 100644
--- a/swamid-1.0/brainstorm.swami.se.xml
+++ b/swamid-1.0/brainstorm.swami.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://brainstorm.swami.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://brainstorm.swamid.se/Shibboleth.sso/DS" index="1"/>
@@ -72,5 +71,4 @@ qaUNxvQRc9GY/GbtcpYRxQJSnCsSKsQjAw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://brainstorm.swami.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://brainstorm.swami.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/cambro-test-26.umdc.umu.se.xml b/swamid-1.0/cambro-test-26.umdc.umu.se.xml
index 922785fc..e685e016 100644
--- a/swamid-1.0/cambro-test-26.umdc.umu.se.xml
+++ b/swamid-1.0/cambro-test-26.umdc.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cambro-test-26.umdc.umu.se/shibboleth">
-
<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://cambro-test-26.umdc.umu.se/Shibboleth.sso/WAYF"/>
@@ -51,5 +50,4 @@ XOi6QTTaGpYW3p3/v0OI
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cambro-test-26.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/cambro-tst1.umdc.umu.se.xml b/swamid-1.0/cambro-tst1.umdc.umu.se.xml
index 75fcc7b8..3de6f7c2 100644
--- a/swamid-1.0/cambro-tst1.umdc.umu.se.xml
+++ b/swamid-1.0/cambro-tst1.umdc.umu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cambro-tst1.umdc.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
@@ -88,5 +87,4 @@ n5/yB4LGJWrAQjc=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/cambro-utv1.umdc.umu.se.xml b/swamid-1.0/cambro-utv1.umdc.umu.se.xml
index 3b821889..80da43fa 100644
--- a/swamid-1.0/cambro-utv1.umdc.umu.se.xml
+++ b/swamid-1.0/cambro-utv1.umdc.umu.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cambro-utv1.umdc.umu.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
diff --git a/swamid-1.0/captivelan-test.it.su.se.xml b/swamid-1.0/captivelan-test.it.su.se.xml
index 4bdbac2b..9e340309 100644
--- a/swamid-1.0/captivelan-test.it.su.se.xml
+++ b/swamid-1.0/captivelan-test.it.su.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://captivelan-test.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan-test.it.su.se/Shibboleth.sso/WAYF"/>
@@ -54,5 +54,4 @@ p63AVSlYluX3+fdIHqVDx/AlXll4KlcPLiVRIXZd9C0WYi4I0hbw0GiWngU/GLaC
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://captivelan-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://captivelan-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/captivelan.it.su.se.xml b/swamid-1.0/captivelan.it.su.se.xml
index 3deac930..63bc6c1b 100644
--- a/swamid-1.0/captivelan.it.su.se.xml
+++ b/swamid-1.0/captivelan.it.su.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://captivelan.it.su.se/Shibboleth.sso">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
@@ -53,5 +54,4 @@ ROU2a0niXfGVaIomY/J7Xkazao4dQmFvwHY77hTp6Qhf3PlYOw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/cbs-vylvatest.kib.ki.se.xml b/swamid-1.0/cbs-vylvatest.kib.ki.se.xml
index e44a6ce9..b5f76502 100644
--- a/swamid-1.0/cbs-vylvatest.kib.ki.se.xml
+++ b/swamid-1.0/cbs-vylvatest.kib.ki.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cbs-vylvatest.kib.ki.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/cdn.nordunet.tv.xml b/swamid-1.0/cdn.nordunet.tv.xml
index fac469ac..c63bdf02 100644
--- a/swamid-1.0/cdn.nordunet.tv.xml
+++ b/swamid-1.0/cdn.nordunet.tv.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cdn.nordunet.tv/shibboleth">
-
<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://cdn.nordunet.tv/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -48,5 +47,4 @@ CRJ84BDp/TuK
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdn.nordunet.tv/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdn.nordunet.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/coip-test.sunet.se-sp.xml b/swamid-1.0/coip-test.sunet.se-sp.xml
index c7e07f96..39b70c7c 100644
--- a/swamid-1.0/coip-test.sunet.se-sp.xml
+++ b/swamid-1.0/coip-test.sunet.se-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coip-test.sunet.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://coip-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -73,5 +72,4 @@ cA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://coip-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/coip-test.sunet.se.xml b/swamid-1.0/coip-test.sunet.se.xml
index 2b85919e..1502477c 100644
--- a/swamid-1.0/coip-test.sunet.se.xml
+++ b/swamid-1.0/coip-test.sunet.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://coip-test.sunet.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://coip-test.sunet.se/idp/shibboleth">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDNDCCAhygAwIBAgIVAIEijMHQfZuv/n/goQuJ0Q4JizX1MA0GCSqGSIb3DQEB
BQUAMB0xGzAZBgNVBAMTEmNvaXAtdGVzdC5zdW5ldC5zZTAeFw0xMDEyMDYyMzI1
MTNaFw0zMDEyMDYyMzI1MTNaMB0xGzAZBgNVBAMTEmNvaXAtdGVzdC5zdW5ldC5z
@@ -34,19 +28,12 @@ ZBkqgmTtNcDZXR2FaflUDmM7Xk1gw581bWdYCpQZHNQv7Kh7yAeQWjU2OoYFm3U9
C2+Rm0cXr6U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://coip-test.sunet.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://coip-test.sunet.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://coip-test.sunet.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/confluence-test.it.su.se.xml b/swamid-1.0/confluence-test.it.su.se.xml
index e83e062c..f5809cbd 100644
--- a/swamid-1.0/confluence-test.it.su.se.xml
+++ b/swamid-1.0/confluence-test.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://confluence-test.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -74,5 +73,4 @@ Uc3kqnPScQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/confluence.it.su.se.xml b/swamid-1.0/confluence.it.su.se.xml
index c7241a08..1fcd5ab3 100644
--- a/swamid-1.0/confluence.it.su.se.xml
+++ b/swamid-1.0/confluence.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://confluence.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -74,5 +73,4 @@ qVpQDZd93P9YLQGNulZ1J4JdseJC6nAeXZY+iAiEBCyhx0+NQnlt+BZt7m76yNYi
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/connect-beta.sunet.se.xml b/swamid-1.0/connect-beta.sunet.se.xml
index daf2b8af..762acbeb 100644
--- a/swamid-1.0/connect-beta.sunet.se.xml
+++ b/swamid-1.0/connect-beta.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-beta.sunet.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -83,14 +82,14 @@ FV4q3nujmHDfDpzbO4vsmaumdoScXaR4CoL/mO9XM7dxx/0k8kMkde1eA1mZWQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceDescription>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceDescription>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-1.0/connect-stable.sunet.se.xml b/swamid-1.0/connect-stable.sunet.se.xml
index 870a69b4..476f4b44 100644
--- a/swamid-1.0/connect-stable.sunet.se.xml
+++ b/swamid-1.0/connect-stable.sunet.se.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-stable.sunet.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -84,14 +84,14 @@ SgXS3Q4K3pF+qwGrb3INKQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SUNET E-Meeting Service (stable)</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (stable)</md:ServiceDescription>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">SUNET E-Meeting Service (stable)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (stable)</md:ServiceDescription>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-1.0/connect-test.sunet.se.xml b/swamid-1.0/connect-test.sunet.se.xml
index 5cce6f77..419b83d1 100644
--- a/swamid-1.0/connect-test.sunet.se.xml
+++ b/swamid-1.0/connect-test.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-test.sunet.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -83,5 +82,4 @@ iMkYL+yQK1JqNXDJwr+eW3+iWptUXnyRCnGBrYMAvqw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/connect.sunet.se.xml b/swamid-1.0/connect.sunet.se.xml
index ced31da4..4c3a28b7 100644
--- a/swamid-1.0/connect.sunet.se.xml
+++ b/swamid-1.0/connect.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.sunet.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -88,14 +87,14 @@ bUs=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SUNET E-Meeting Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (Adobe Connect Pro)</md:ServiceDescription>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">SUNET E-Meeting Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (Adobe Connect Pro)</md:ServiceDescription>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-1.0/connect.uninett.no.xml b/swamid-1.0/connect.uninett.no.xml
index 27270a64..12c45851 100644
--- a/swamid-1.0/connect.uninett.no.xml
+++ b/swamid-1.0/connect.uninett.no.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.uninett.no/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -75,15 +74,14 @@ Jw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.uninett.no/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.uninett.no/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UNINETT E-Meeting Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">UNINETT E-Meeting Service (Adobe Connect Pro)</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">UNINETT E-Meeting Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">UNINETT E-Meeting Service (Adobe Connect Pro)</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/converis.info.xml b/swamid-1.0/converis.info.xml
index c4ecb783..21898d0e 100644
--- a/swamid-1.0/converis.info.xml
+++ b/swamid-1.0/converis.info.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://converis.info/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -61,5 +60,4 @@ u7Xr9dYOqLXYBTCx/0NY5C+RF+dq2CYmY8fL/TILzmVGaZhXKzEYKIAPiKv3
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://converis.info/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://converis.info/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/crowd.nordu.net.xml b/swamid-1.0/crowd.nordu.net.xml
index 2233c160..620e55b1 100644
--- a/swamid-1.0/crowd.nordu.net.xml
+++ b/swamid-1.0/crowd.nordu.net.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -73,14 +72,13 @@ Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">NORDUnet Tools</md:ServiceName>
- <md:ServiceDescription xml:lang="en">NORDUnet Tools (confluence, jira)</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:ServiceName xml:lang="en">NORDUnet Tools</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">NORDUnet Tools (confluence, jira)</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/crowdtest.nordu.net.xml b/swamid-1.0/crowdtest.nordu.net.xml
index 815f2f1f..89e41b23 100644
--- a/swamid-1.0/crowdtest.nordu.net.xml
+++ b/swamid-1.0/crowdtest.nordu.net.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://crowdtest.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -75,5 +74,4 @@ wOJ1sg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/dedserv79.levonline.com.xml b/swamid-1.0/dedserv79.levonline.com.xml
index 38fe3735..da8d9023 100644
--- a/swamid-1.0/dedserv79.levonline.com.xml
+++ b/swamid-1.0/dedserv79.levonline.com.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dedserv79.levonline.com/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
@@ -37,7 +37,7 @@ qlG83cbyWydqYCCYruAVslAykrwfBXAXdCs4YBs=</ds:X509Certificate>
<ContactPerson contactType="technical">
<Company>Emanuel AB</Company>
<GivenName>Fredrik</GivenName>
- <SurName>N&#xE4;slund</SurName>
+ <SurName>Näslund</SurName>
<EmailAddress>fredrik.naslund@emanuel.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/dev.lobber.se.xml b/swamid-1.0/dev.lobber.se.xml
index f6433cad..93cdff13 100644
--- a/swamid-1.0/dev.lobber.se.xml
+++ b/swamid-1.0/dev.lobber.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.lobber.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,5 +67,4 @@ Hmi0jDCgx97asTKIuyfGrHl3p3JNN2AJSdTtOSDntnuOYQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.lobber.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.lobber.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/dev.teol.uu.se.xml b/swamid-1.0/dev.teol.uu.se.xml
index 37d98441..4280a771 100644
--- a/swamid-1.0/dev.teol.uu.se.xml
+++ b/swamid-1.0/dev.teol.uu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org/shibboleth">
-
<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://dev.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -37,5 +37,4 @@ gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/download.portal.chalmers.se.xml b/swamid-1.0/download.portal.chalmers.se.xml
index 194fd178..243718db 100644
--- a/swamid-1.0/download.portal.chalmers.se.xml
+++ b/swamid-1.0/download.portal.chalmers.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://download.portal.chalmers.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<md:KeyDescriptor>
diff --git a/swamid-1.0/downloads.channel8.msdn.com.xml b/swamid-1.0/downloads.channel8.msdn.com.xml
index 6d23e807..269e203f 100644
--- a/swamid-1.0/downloads.channel8.msdn.com.xml
+++ b/swamid-1.0/downloads.channel8.msdn.com.xml
@@ -1,45 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
- <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 http://schemas.xmlsoap.org/ws/2003/07/secext" >
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.dreamspark.com</ds:KeyName>
- <ds:X509Data>
- <ds:X509Certificate>
+ <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 http://schemas.xmlsoap.org/ws/2003/07/secext">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.dreamspark.com</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIF+jCCBOKgAwIBAgIKLqDfHAAIAAGj6DANBgkqhkiG9w0BAQUFADCBizETMBEG CgmSJomT8ixkARkWA2NvbTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDEUMBIG CgmSJomT8ixkARkWBGNvcnAxFzAVBgoJkiaJk/IsZAEZFgdyZWRtb25kMSowKAYD VQQDEyFNaWNyb3NvZnQgU2VjdXJlIFNlcnZlciBBdXRob3JpdHkwHhcNMTAwNzMw MDAyMTA4WhcNMTEwNzMwMDAyMTA4WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK V2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTETMBEGA1UEChMKRmFzdCBUcmFj azEUMBIGA1UECxMLRHJlYW0gU3BhcmsxGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJr LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtsyFSuceS0RVGHD1Qbch DWIdIGfELS06JXkb6EJELGld5j4P50fGSqMXDcPIt3jHqjt9jnd5aqJP4Z5ROs5p hJ7fXtm56taeSVTfZSQRIzlVyaIG1QSKeqdlt6GWZrlV+Gy2cKAglMcKh5/y5ISP /TbQWeJtreT+Pi/Aj0IQcGUCAwEAAaOCAvAwggLsMAsGA1UdDwQEAwIEsDBEBgkq hkiG9w0BCQ8ENzA1MA4GCCqGSIb3DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwBwYF Kw4DAgcwCgYIKoZIhvcNAwcwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB MB0GA1UdDgQWBBT2xedjpxaZG/9bcyw3cEROspTL0DAfBgNVHSMEGDAWgBQIQuPb ThFm87UIxUDbVXwzRhGDODCCAQoGA1UdHwSCAQEwgf4wgfuggfiggfWGWGh0dHA6 Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL01pY3Jvc29mdCUy MFNlY3VyZSUyMFNlcnZlciUyMEF1dGhvcml0eSg4KS5jcmyGVmh0dHA6Ly9jcmwu bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9NaWNyb3NvZnQlMjBTZWN1cmUl MjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3JshkFodHRwOi8vY29ycHBraS9jcmwv TWljcm9zb2Z0JTIwU2VjdXJlJTIwU2VydmVyJTIwQXV0aG9yaXR5KDgpLmNybDCB vwYIKwYBBQUHAQEEgbIwga8wXgYIKwYBBQUHMAKGUmh0dHA6Ly93d3cubWljcm9z b2Z0LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUyMFNlY3VyZSUyMFNlcnZlciUy MEF1dGhvcml0eSg4KS5jcnQwTQYIKwYBBQUHMAKGQWh0dHA6Ly9jb3JwcGtpL2Fp YS9NaWNyb3NvZnQlMjBTZWN1cmUlMjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3J0 MD8GCSsGAQQBgjcVBwQyMDAGKCsGAQQBgjcVCIPPiU2t8gKFoZ8MgvrKfYHh+3SB T4PC7YUIjqnShWMCAWQCAQkwJwYJKwYBBAGCNxUKBBowGDAKBggrBgEFBQcDAjAK BggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOCAQEACAHi+mcrNHJ/W+uBtnzD3mAm ai3QiLWiJE3dKuNtHV8Ba64E2l69Q7pmnFCr1eM5wlvnQcOqbVyZjk/okp4aRxBw ARn3KtvkhbSOHjaDYv3FXvobBXgenbPFydPvNmQrPGdTRSUf+q4duaYVSx2YAqpr HnYDbddNBJuFzfyywu6WSsrwgqUUW3jAaNmcrX7U5Z/sN1CQVOcx4dQ3nqXTYbgm 5+nddJhnC9PDyK4A4epAO9CA7h9023fRh9AZx17dgpRtteb+8JlV1+iMRdG/VrJK Gmnt8WCQFfOSQNChmicJikdzGfjtDjOqKA5g5CxxrwKWO7S5DaDH7Q286CkSXg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Microsoft</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>DreamSpark Engineering Team</GivenName>
- <EmailAddress>dsengt@microsoft.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>Scott</GivenName>
- <SurName>Blackwell</SurName>
- <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
- </ContactPerson>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Microsoft</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>DreamSpark Engineering Team</GivenName>
+ <EmailAddress>dsengt@microsoft.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Scott</GivenName>
+ <SurName>Blackwell</SurName>
+ <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/dspace.it.su.se.xml b/swamid-1.0/dspace.it.su.se.xml
index a3f42c9d..66d762cd 100644
--- a/swamid-1.0/dspace.it.su.se.xml
+++ b/swamid-1.0/dspace.it.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dspace.it.su.se">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml b/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml
index b298065b..983f1f33 100644
--- a/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://dwidp.nyautb.its.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.nyautb.its.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.nyautb.its.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml b/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
index 7eba09c6..a1d910bf 100644
--- a/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://dwidp.testa.antagning.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testa.antagning.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJALQfyxnxGcIlMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMTExMDMxNTIwNTJaFw0yMTEwMzExNTIwNTJaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDj3otRX9M3nNqyzlP3WYLM1YDP3NNJfrecwHD0zxG+Ft27z57KSK5ReMXJe563Gv88MUYP7xXuxZrYYYZMfjLhAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD5/eg5m7hEbBTQjGM4VVhAer70vMFMGA1UdIwRMMEqAFD5/eg5m7hEbBTQjGM4VVhAer70voSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQC0H8sZ8RnCJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAj0sRR5pI/THUnP4Ywnfl9mjQ6BMu5nJG4m3zHaRj3wkeGhNRFgHDHk2YQtMqOMjC3PwarQgIl7cRLYPFhyiP+g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://dwidp.testa.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testa.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJALQfyxnxGcIlMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMTExMDMxNTIwNTJaFw0yMTEwMzExNTIwNTJaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDj3otRX9M3nNqyzlP3WYLM1YDP3NNJfrecwHD0zxG+Ft27z57KSK5ReMXJe563Gv88MUYP7xXuxZrYYYZMfjLhAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD5/eg5m7hEbBTQjGM4VVhAer70vMFMGA1UdIwRMMEqAFD5/eg5m7hEbBTQjGM4VVhAer70voSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQC0H8sZ8RnCJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAj0sRR5pI/THUnP4Ywnfl9mjQ6BMu5nJG4m3zHaRj3wkeGhNRFgHDHk2YQtMqOMjC3PwarQgIl7cRLYPFhyiP+g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testa.antagning.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testa.antagning.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml b/swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml
index f2bf30a0..00c674a1 100644
--- a/swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://dwidp.testb.antagning.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testb.antagning.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJAK9IwIV5pteUMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTAeFw0xMTA4MzExMjQyMTBaFw0yMTA4MjgxMjQyMTBaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGr4pLVe1btwLMC6MBsh6/lhDXbNmEQ3QAC2rh2gNEyhyiQJwNcqnOtYc1haC+mVrRI4MfB9z+KHfLiWsK14vBAgMBAAGjgYUwgYIwHQYDVR0OBBYEFLD+o7ou3DNUH3EL+Ya2AbYNlAANMFMGA1UdIwRMMEqAFLD+o7ou3DNUH3EL+Ya2AbYNlAANoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCvSMCFeabXlDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAdceJ/0JThcaLw3Y+0roaVpdFBVMSUzFWYc0Y2d+PxNXGCiC3R5vUdpc/8bjX49zf4cEs8BLEazPX0GL4CePksw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://dwidp.testb.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testb.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJAK9IwIV5pteUMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTAeFw0xMTA4MzExMjQyMTBaFw0yMTA4MjgxMjQyMTBaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGr4pLVe1btwLMC6MBsh6/lhDXbNmEQ3QAC2rh2gNEyhyiQJwNcqnOtYc1haC+mVrRI4MfB9z+KHfLiWsK14vBAgMBAAGjgYUwgYIwHQYDVR0OBBYEFLD+o7ou3DNUH3EL+Ya2AbYNlAANMFMGA1UdIwRMMEqAFLD+o7ou3DNUH3EL+Ya2AbYNlAANoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCvSMCFeabXlDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAdceJ/0JThcaLw3Y+0roaVpdFBVMSUzFWYc0Y2d+PxNXGCiC3R5vUdpc/8bjX49zf4cEs8BLEazPX0GL4CePksw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testb.antagning.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testb.antagning.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
index b7207469..1974a16a 100644
--- a/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testc.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.se: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>
</EntityDescriptor>
diff --git a/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
index 4cff8f30..b7898210 100644
--- a/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testd.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.se: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>
</EntityDescriptor>
diff --git a/swamid-1.0/e5.onthehub.com.xml b/swamid-1.0/e5.onthehub.com.xml
index d548c8af..75ecbc29 100644
--- a/swamid-1.0/e5.onthehub.com.xml
+++ b/swamid-1.0/e5.onthehub.com.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate> MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate> MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
@@ -19,45 +20,32 @@
VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T l8qQhkUldJphTqx2PEHORBM=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService index="1"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="2"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="3"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="4"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="5"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST"
- Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="6"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact"
- Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">E-academy, Inc.</OrganizationName>
- <OrganizationDisplayName xml:lang="en">E-academy, Inc.</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.e-academy.com/index.cfm</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="technical">
- <GivenName>Islam Gomaa</GivenName>
- <EmailAddress>SWAMID@e-academy.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>Islam Gomaa</GivenName>
- <EmailAddress>SWAMID@e-academy.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Islam Gomaa</GivenName>
- <EmailAddress>SWAMID@e-academy.com</EmailAddress>
- </ContactPerson>
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="1" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
+ <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="2" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"/>
+ <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="3" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"/>
+ <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="4" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"/>
+ <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="5" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"/>
+ <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" index="6" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">E-academy, Inc.</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">E-academy, Inc.</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.e-academy.com/index.cfm</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Islam Gomaa</GivenName>
+ <EmailAddress>SWAMID@e-academy.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Islam Gomaa</GivenName>
+ <EmailAddress>SWAMID@e-academy.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Islam Gomaa</GivenName>
+ <EmailAddress>SWAMID@e-academy.com</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml b/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
index c6cbfea2..29f9e272 100644
--- a/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
+++ b/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
@@ -1,106 +1,76 @@
-<EntityDescriptor entityID="https://ecsidp.antagning.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.antagning.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://ecsidp.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ecsidp.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">
Universitets- och högskolerådet
</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">
+ <mdui:DisplayName xml:lang="en">
Swedish Council for Higher Education
</mdui:DisplayName>
- <mdui:Description xml:lang="sv">
+ <mdui:Description xml:lang="sv">
Identity Provider för expertklient-användare av NyA-systemet.
</mdui:Description>
- <mdui:Description xml:lang="en">
+ <mdui:Description xml:lang="en">
The Identity Provider for expert client users of the NyA-system.
</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.antagning.se: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">
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.se: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">
UHR
</OrganizationName>
- <OrganizationDisplayName xml:lang="en">
+ <OrganizationDisplayName xml:lang="en">
Swedish Council for Higher Education
</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">
+ <OrganizationURL xml:lang="en">
http://www.uhr.se
</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>
Swedish Council for Higher Education
</Company>
- <EmailAddress>
+ <EmailAddress>
appldrift_saml@uhr.se
</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml b/swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml
index 78cf4e52..7549a2bb 100644
--- a/swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml
+++ b/swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ecsidp.testa.antagning.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.testa.antagning.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJANhJ+qNF90hMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2UwHhcNMTIxMjEwMTIzMjE5WhcNMjIxMjA4MTIzMjE5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGEuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN8dn+bredQ2auZhy7AzqrYbDEGUNBgqZTCVredzhLDzf938Mf3CjL3Sm/TAv7knA2e9t0v7zujC1qQWz8tXkC0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUX4DQmxgmR0gLweAGWPI1dmsDF2owVAYDVR0jBE0wS4AUX4DQmxgmR0gLweAGWPI1dmsDF2qhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDYSfqjRfdITDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAbXNQpqiCBG++l2dOV1yJC1Eo9wF2aXjhqcARxLCh4DtQa26ahD28QJNONmNyeRwECEqNcK9xGjTiIvIX+DlL7g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://ecsidp.testa.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.testa.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJANhJ+qNF90hMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2UwHhcNMTIxMjEwMTIzMjE5WhcNMjIxMjA4MTIzMjE5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGEuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN8dn+bredQ2auZhy7AzqrYbDEGUNBgqZTCVredzhLDzf938Mf3CjL3Sm/TAv7knA2e9t0v7zujC1qQWz8tXkC0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUX4DQmxgmR0gLweAGWPI1dmsDF2owVAYDVR0jBE0wS4AUX4DQmxgmR0gLweAGWPI1dmsDF2qhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDYSfqjRfdITDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAbXNQpqiCBG++l2dOV1yJC1Eo9wF2aXjhqcARxLCh4DtQa26ahD28QJNONmNyeRwECEqNcK9xGjTiIvIX+DlL7g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testa.antagning.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testa.antagning.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml b/swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml
index 458da16c..9e93cbf0 100644
--- a/swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml
+++ b/swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml
@@ -1,106 +1,76 @@
-<EntityDescriptor entityID="https://ecsidp.testb.antagning.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.testb.antagning.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJAMptPNMb9t58MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2UwHhcNMTMwNDA5MTIzOTE0WhcNMjMwNDA3MTIzOTE0WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGIuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0IHQx1Wp3X3XbG0lFDbSomZSzCTPlmSDs3/V6qHf/QKY2QdP4jYE8OfjkpmcEcJ74jTziAJCMcGdIMvPZgTU0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUv+uhe9BzI7V1JIfMFPagyYXBKZswVAYDVR0jBE0wS4AUv+uhe9BzI7V1JIfMFPagyYXBKZuhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQDKbTzTG/befDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAk4O6FFVkSvza7hfFmOAKm8H9UlWR4xN0dHspzPE0F0wRiyPGHOMezn1FSMPWTvJswRa5BioDh+EyUBYtiFoU4g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://ecsidp.testb.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.testb.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">
Universitets- och högskolerådet
</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">
+ <mdui:DisplayName xml:lang="en">
Swedish Council for Higher Education
</mdui:DisplayName>
- <mdui:Description xml:lang="sv">
+ <mdui:Description xml:lang="sv">
Identity Provider för expertklient-användare av NyA-systemet(Test B).
</mdui:Description>
- <mdui:Description xml:lang="en">
+ <mdui:Description xml:lang="en">
The Identity Provider for expert client users of the NyA-system(Test B).
</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJAMptPNMb9t58MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2UwHhcNMTMwNDA5MTIzOTE0WhcNMjMwNDA3MTIzOTE0WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGIuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0IHQx1Wp3X3XbG0lFDbSomZSzCTPlmSDs3/V6qHf/QKY2QdP4jYE8OfjkpmcEcJ74jTziAJCMcGdIMvPZgTU0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUv+uhe9BzI7V1JIfMFPagyYXBKZswVAYDVR0jBE0wS4AUv+uhe9BzI7V1JIfMFPagyYXBKZuhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQDKbTzTG/befDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAk4O6FFVkSvza7hfFmOAKm8H9UlWR4xN0dHspzPE0F0wRiyPGHOMezn1FSMPWTvJswRa5BioDh+EyUBYtiFoU4g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testb.antagning.se: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">
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testb.antagning.se: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">
UHR
</OrganizationName>
- <OrganizationDisplayName xml:lang="en">
+ <OrganizationDisplayName xml:lang="en">
Swedish Council for Higher Education
</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">
+ <OrganizationURL xml:lang="en">
http://www.uhr.se
</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>
Swedish Council for Higher Education
</Company>
- <EmailAddress>
+ <EmailAddress>
appldrift_saml@uhr.se
</EmailAddress>
- </ContactPerson>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml b/swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml
index 80422f13..b65392e9 100644
--- a/swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml
+++ b/swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ecsidp.testc.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.testc.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJAONOoNkuanjeMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTE0MzM5WhcNMjIxMDA4MTE0MzM5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOGuybYMfqEJl3PTvX2uQuHlFpASqIUpakptQjA9Omz1cmi/YTuS4dFPkr5aIl8H6JXtGFdo+Lq3gH65GnUdd28CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUGnxfGjrwc3UH63OtKWL56joyuPQwVAYDVR0jBE0wS4AUGnxfGjrwc3UH63OtKWL56joyuPShKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDjTqDZLmp43jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAIS7QmF/7Dydbfb7ob7eiX7ASIZSSkN8M8Hoei6VIokrs0+FPgzL8rcJTr5LiCec2hBDvlTBt5wvQ3gmh9Oywww==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://ecsidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJAONOoNkuanjeMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTE0MzM5WhcNMjIxMDA4MTE0MzM5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOGuybYMfqEJl3PTvX2uQuHlFpASqIUpakptQjA9Omz1cmi/YTuS4dFPkr5aIl8H6JXtGFdo+Lq3gH65GnUdd28CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUGnxfGjrwc3UH63OtKWL56joyuPQwVAYDVR0jBE0wS4AUGnxfGjrwc3UH63OtKWL56joyuPShKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDjTqDZLmp43jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAIS7QmF/7Dydbfb7ob7eiX7ASIZSSkN8M8Hoei6VIokrs0+FPgzL8rcJTr5LiCec2hBDvlTBt5wvQ3gmh9Oywww==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testc.ladok.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testc.ladok.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml b/swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml
index 85e85fe4..8dd9a984 100644
--- a/swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml
+++ b/swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ecsidp.testd.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.testd.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJAPV86YQgG+jXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTEzODMyWhcNMjIxMDA4MTEzODMyWjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrrJQ3t1LwfBueH8pcBbBocDtD2AX8zKG9hor4MAylvE9NW4GDSpsEJNUFSjK+TQlsvmplt2WpTce97Ifs1UVECAwEAAaOBhjCBgzAdBgNVHQ4EFgQUPr+iaIhVcj5eHKQM+EO4yV6VtmAwVAYDVR0jBE0wS4AUPr+iaIhVcj5eHKQM+EO4yV6VtmChKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQD1fOmEIBvo1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAqt4T+C2Ff2gysd2ZcgpBaiTtsMpmiFiD9Bak2uQp+PmWGYvQNNGsOaZMqNCW4rUPCwa9Ny4OcF0jPqzi+sFd5w==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://ecsidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIByDCCAXKgAwIBAgIJAPV86YQgG+jXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTEzODMyWhcNMjIxMDA4MTEzODMyWjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrrJQ3t1LwfBueH8pcBbBocDtD2AX8zKG9hor4MAylvE9NW4GDSpsEJNUFSjK+TQlsvmplt2WpTce97Ifs1UVECAwEAAaOBhjCBgzAdBgNVHQ4EFgQUPr+iaIhVcj5eHKQM+EO4yV6VtmAwVAYDVR0jBE0wS4AUPr+iaIhVcj5eHKQM+EO4yV6VtmChKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQD1fOmEIBvo1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAqt4T+C2Ff2gysd2ZcgpBaiTtsMpmiFiD9Bak2uQp+PmWGYvQNNGsOaZMqNCW4rUPCwa9Ny4OcF0jPqzi+sFd5w==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ecsidp.testd.ladok.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testd.ladok.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/egiswamid.egi.kth.se.xml b/swamid-1.0/egiswamid.egi.kth.se.xml
index 66db6dbd..496c1eba 100644
--- a/swamid-1.0/egiswamid.egi.kth.se.xml
+++ b/swamid-1.0/egiswamid.egi.kth.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://egiswamid.egi.kth.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
diff --git a/swamid-1.0/ensky.lhs.se.xml b/swamid-1.0/ensky.lhs.se.xml
index fa5c6251..5013ff4b 100644
--- a/swamid-1.0/ensky.lhs.se.xml
+++ b/swamid-1.0/ensky.lhs.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ensky.lhs.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/epc.ub.uu.se.xml b/swamid-1.0/epc.ub.uu.se.xml
index ebb9149a..1a918d28 100644
--- a/swamid-1.0/epc.ub.uu.se.xml
+++ b/swamid-1.0/epc.ub.uu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epc.ub.uu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://epc.ub.uu.se/Shibboleth.sso/DS" index="1"/>
@@ -71,5 +70,4 @@ LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/expert.antagning.se.xml b/swamid-1.0/expert.antagning.se.xml
index 227109c7..4e8a633f 100644
--- a/swamid-1.0/expert.antagning.se.xml
+++ b/swamid-1.0/expert.antagning.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.antagning.se/ecs-sp">
<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:KeyDescriptor use="signing">
@@ -70,5 +71,4 @@ hMvkdB9ux/vPq93rCzcdDnW+zoZmsj1EXtqjDSSEgb/6zJ+ExbZ29Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml b/swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml
index 96ded5b7..d7805d3d 100644
--- a/swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml
+++ b/swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.nyautb.its.umu.se/ecs-sp">
-
<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://expert.nyautb.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ Pg/PxwRl7683LF0B
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
index 9559cfbb..91ea5e10 100644
--- a/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
+++ b/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testa.antagning.se/ecs-sp">
-
<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://expert.testa.antagning.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ KpzNWnJjueWGyd3A1bNfLKm5zayFB1wNyPe5uKnSX5Q=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml b/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml
index 707c6fd2..cab49390 100644
--- a/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml
+++ b/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testb.antagning.se/ecs-sp">
-
<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://expert.testb.antagning.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ DM76OjYz/sAlKD7IN6ihFwi1Coh3VTcWWvi0bHy8fMlhoNBGwLa+BuDxVwodMmrY
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml b/swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml
index ed809d21..8cd3e03d 100644
--- a/swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testc.ladok.umu.se/ecs-sp">
-
<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://expert.testc.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ w8W5oFPayICDCTdBw3YHuA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml b/swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml
index 5ce3586f..46991f08 100644
--- a/swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testd.ladok.umu.se/ecs-sp">
-
<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://expert.testd.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ D9i+gxjig0iyrkrILGeOdQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/flax.nettst.chalmers.se.xml b/swamid-1.0/flax.nettst.chalmers.se.xml
index 41d917ee..b7f3fe7a 100644
--- a/swamid-1.0/flax.nettst.chalmers.se.xml
+++ b/swamid-1.0/flax.nettst.chalmers.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://flax.nettst.chalmers.se/adfs/services/trust">
<RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="flax.nettst.chalmers.se">
<KeyDescriptor use="encryption">
diff --git a/swamid-1.0/fordrop.irt.kth.se.xml b/swamid-1.0/fordrop.irt.kth.se.xml
index 18f39a17..47d16166 100644
--- a/swamid-1.0/fordrop.irt.kth.se.xml
+++ b/swamid-1.0/fordrop.irt.kth.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fordrop.irt.kth.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fordrop.irt.kth.se/Shibboleth.sso/DS" index="1"/>
@@ -72,5 +71,4 @@ Gf34FPGbKFm1+jJpyOoBAfizkFtGFRM3zkyhGZtGcQgUobPdCUEpCnAkqOIs/bpZ
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fordrop.irt.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fordrop.irt.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml
index f9b62438..8b87312e 100644
--- a/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/aws-sp-en">
-
<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://ft11.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ cAPbVt5WXPJfyQ9aIwH6FMg6rzmos2O4n7Us9gatMw6tTGI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-aws-sp.xml b/swamid-1.0/ft11.ladok.umu.se-aws-sp.xml
index 1007b89c..1957324e 100644
--- a/swamid-1.0/ft11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml b/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
index 6c45305f..e6fb91ca 100644
--- a/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml
index 7d2f9ed0..cf15b9ea 100644
--- a/swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
index 5c3c5cd2..f62b0ea2 100644
--- a/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/ft11_idp-metadata.xml b/swamid-1.0/ft11_idp-metadata.xml
index 7f92febf..d8f952d3 100644
--- a/swamid-1.0/ft11_idp-metadata.xml
+++ b/swamid-1.0/ft11_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ft11.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJANBiS9OLRJ9IMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1GOs+V9RmWvQaoj9EhK+VbXaEPHkislgaf99/wK5woiuYvTvz+X9CcLUQpgdn726mJHjnENuXMFKFNGV0i1q1wIDAQABo30wezAdBgNVHQ4EFgQU07qj2zK3kz7JeshJzgpyb+1tGEkwTAYDVR0jBEUwQ4AU07qj2zK3kz7JeshJzgpyb+1tGEmhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA0GJL04tEn0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGcir8I3KTVd2LL4ZBu/hGhazxsVXLO4K8pGgOz2mce5WlaR/1rJLbwzV2VncIGbr2Yil0u8tPAgt45HnNJYiEM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft11.ladok.umu.se:8452/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://ft11.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8452/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://ft11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJANBiS9OLRJ9IMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1GOs+V9RmWvQaoj9EhK+VbXaEPHkislgaf99/wK5woiuYvTvz+X9CcLUQpgdn726mJHjnENuXMFKFNGV0i1q1wIDAQABo30wezAdBgNVHQ4EFgQU07qj2zK3kz7JeshJzgpyb+1tGEkwTAYDVR0jBEUwQ4AU07qj2zK3kz7JeshJzgpyb+1tGEmhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA0GJL04tEn0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGcir8I3KTVd2LL4ZBu/hGhazxsVXLO4K8pGgOz2mce5WlaR/1rJLbwzV2VncIGbr2Yil0u8tPAgt45HnNJYiEM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft11.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/gallus.scilifelab.se.xml b/swamid-1.0/gallus.scilifelab.se.xml
index ab14d051..1b6f57aa 100644
--- a/swamid-1.0/gallus.scilifelab.se.xml
+++ b/swamid-1.0/gallus.scilifelab.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gallus.scilifelab.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -14,12 +13,11 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gallus.scilifelab.se/Shibboleth.sso/Login"/>
@@ -77,5 +75,4 @@ qR3yqb2bdeQUWqkU0/5RA1uDcK8D+f2xAC2npJVHTd1a+1rKgA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gallus.scilifelab.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gallus.scilifelab.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/graduateland.com.xml b/swamid-1.0/graduateland.com.xml
index 141c932c..0b235b7c 100644
--- a/swamid-1.0/graduateland.com.xml
+++ b/swamid-1.0/graduateland.com.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://graduateland.com/simplesaml/module.php/saml/sp/metadata.php/gl_gateway">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-1.0/hbidp.hb.se.xml b/swamid-1.0/hbidp.hb.se.xml
index 744011c4..2410b430 100644
--- a/swamid-1.0/hbidp.hb.se.xml
+++ b/swamid-1.0/hbidp.hb.se.xml
@@ -1,53 +1,47 @@
-<EntityDescriptor entityID="https://hbidp.hb.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
- <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
- <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-</mdui:UIInfo>
-<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
- <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
- <mdui:DomainHint>hb.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
-</mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hbidp.hb.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+ <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
+ <mdui:DomainHint>hb.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
@@ -75,44 +69,26 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
9Ks=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://hbidp.hb.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://hbidp.hb.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
@@ -140,21 +116,14 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
9Ks=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://hbidp.hb.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se: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">HB</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan i Borås</OrganizationDisplayName>
@@ -164,5 +133,4 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
<Company>Högskolan i Borås</Company>
<EmailAddress>mikael.furth@hb.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/hhs_metadata.xml b/swamid-1.0/hhs_metadata.xml
index 62031ca8..d46497e5 100644
--- a/swamid-1.0/hhs_metadata.xml
+++ b/swamid-1.0/hhs_metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://callback-prod.inloggning.se/simplesaml/saml2/idp/meta_7baf0ac137159c2b28aebc5956e46bff">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEszCCBBygAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwIBcNMTMwMjI3MTkwOTUxWhgPMjA1NTAzMjQxOTA5NTFaMIHxMQswCQYDVQQGEwJTRTEQMA4GA1UECBMHVXBwbGFuZDEQMA4GA1UEBxMHVXBwc2FsYTElMCMGA1UEChMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTFJMEcGA1UECxRASGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbV9IYW5kZWxzaMO2Z3Nrb2xhbiBpIFN0b2NraG9sbV9TdmVJRDElMCMGA1UEAxMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp9bWZrlq/UMCHXlF36AXf8/C3emyOU86q4r3ouW+mOqrOzpnRF6W/7nMPdFWKYOFzC2gjGCGKG24rFAkNyW4qLUAF/R4lGHFOnZpcWeE8aCTwne8l3NdkZ3mKCj3/h4969+MgR2malTEk/bWR8fCtPfZtjgDOmRA9A2aaPJbvBUCAwEAAaOCAVUwggFRMB0GA1UdDgQWBBSa/TT11CoSMwD75RbSe2BeGnZ+jzCCASAGA1UdIwSCARcwggETgBSa/TT11CoSMwD75RbSe2BeGnZ+j6GB96SB9DCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQCCWkab83PQphIqKhxIF7WubZvC2Nz+t69VP1LIGP5X8mIEqLHchPFJlPmWdWu+nEBsp9iEkP2QNBZi1R8LVmqlc+DavtpedHs58Oihe9FuWb9hrjFHglvJm4VIAuJ72zo1oS5HCYNNxS7ohXSkY3OdEhEyssypW3LnjnoTesn2FQ==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEszCCBBygAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwIBcNMTMwMjI3MTkwOTUxWhgPMjA1NTAzMjQxOTA5NTFaMIHxMQswCQYDVQQGEwJTRTEQMA4GA1UECBMHVXBwbGFuZDEQMA4GA1UEBxMHVXBwc2FsYTElMCMGA1UEChMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTFJMEcGA1UECxRASGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbV9IYW5kZWxzaMO2Z3Nrb2xhbiBpIFN0b2NraG9sbV9TdmVJRDElMCMGA1UEAxMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp9bWZrlq/UMCHXlF36AXf8/C3emyOU86q4r3ouW+mOqrOzpnRF6W/7nMPdFWKYOFzC2gjGCGKG24rFAkNyW4qLUAF/R4lGHFOnZpcWeE8aCTwne8l3NdkZ3mKCj3/h4969+MgR2malTEk/bWR8fCtPfZtjgDOmRA9A2aaPJbvBUCAwEAAaOCAVUwggFRMB0GA1UdDgQWBBSa/TT11CoSMwD75RbSe2BeGnZ+jzCCASAGA1UdIwSCARcwggETgBSa/TT11CoSMwD75RbSe2BeGnZ+j6GB96SB9DCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQCCWkab83PQphIqKhxIF7WubZvC2Nz+t69VP1LIGP5X8mIEqLHchPFJlPmWdWu+nEBsp9iEkP2QNBZi1R8LVmqlc+DavtpedHs58Oihe9FuWb9hrjFHglvJm4VIAuJ72zo1oS5HCYNNxS7ohXSkY3OdEhEyssypW3LnjnoTesn2FQ==</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-1.0/hr.su.se.xml b/swamid-1.0/hr.su.se.xml
index 46b55fb6..57a544cb 100644
--- a/swamid-1.0/hr.su.se.xml
+++ b/swamid-1.0/hr.su.se.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
This is example metadata only. Do *NOT* supply it as is without review,
and do *NOT* provide it in real time to your partners.
-->
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hr.su.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -18,7 +17,6 @@ and do *NOT* provide it in real time to your partners.
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://hr.su.se/Shibboleth.sso/Login"/>
@@ -67,19 +65,19 @@ gwi5chzD+EG7sLZMZ+izxSBoFuMKIFfmz37zEafLh0z1YOBqLt20uxjw+ulMKLz4
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hr.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hr.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">
EVRY HR Solutions AB
</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">
+ <md:OrganizationDisplayName xml:lang="en">
EVRY HR
</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">
+ <md:OrganizationURL xml:lang="en">
http://www.evry.se
</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Primulasupport</md:SurName>
- <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Primulasupport</md:SurName>
+ <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml
index 521654db..115309ea 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.ladok.umu.se/aws-sp-en">
-
<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://hubbletest.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ qIxQGEdChCCBgvI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml b/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
index e6a0ddcf..029e7d3f 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJANLq4OZpe55MMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1M1oXDTIwMTIwNTEwMjQ1M1owIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2Fn4jYxMvzBoAI/9XjTirxcmU/YSGvJV668ZuW9SRZQRMhdXTj/Ct0MPIRsTK256/TkUit9ISqOUaHbq7ycwPwIDAQABo4GEMIGBMB0GA1UdDgQWBBRfPik1sc4sm0VdmVgbK65T7BZpnDBSBgNVHSMESzBJgBRfPik1sc4sm0VdmVgbK65T7BZpnKEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDS6uDmaXueTDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAc+oA/4hTzwUGQbsJ+z0iHYyiVuXiiT3z7wyCqAN8pfpa2yayrW1/XOLiG4EuDxpNF/C4f01kZwyCCsz1Nqgplw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/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://hubbletest.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/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://hubbletest.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJANLq4OZpe55MMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1M1oXDTIwMTIwNTEwMjQ1M1owIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2Fn4jYxMvzBoAI/9XjTirxcmU/YSGvJV668ZuW9SRZQRMhdXTj/Ct0MPIRsTK256/TkUit9ISqOUaHbq7ycwPwIDAQABo4GEMIGBMB0GA1UdDgQWBBRfPik1sc4sm0VdmVgbK65T7BZpnDBSBgNVHSMESzBJgBRfPik1sc4sm0VdmVgbK65T7BZpnKEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDS6uDmaXueTDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAc+oA/4hTzwUGQbsJ+z0iHYyiVuXiiT3z7wyCqAN8pfpa2yayrW1/XOLiG4EuDxpNF/C4f01kZwyCCsz1Nqgplw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml b/swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml
index fbe650cb..d7efa8e4 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ GawGIqkPtA/Y3LAJhwA9qpVH6jywJy53/exXtdno7dwRUjKd8hR+/RqWTSdO6nzf
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
index 7c627a87..1d6fcb1e 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1NFoXDTIwMTIwNTEwMjQ1NFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1mFR94qRsjGB+ukhqu+R/2fvZb9aQ39OrsNhQM8q22dtv8vK9X/ZX+Ym1Mv7/AVMCDwZhEVM2ioPFijk+hQAQQIDAQABo4GEMIGBMB0GA1UdDgQWBBTsJeuxItIS63xBOl92WQmpIgNm5jBSBgNVHSMESzBJgBTsJeuxItIS63xBOl92WQmpIgNm5qEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDjDsLXLLwXUTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EABXkSZKvoDu+elTr2M3Gcj0Igx0D2zaE2l7SW59JJLprHL0TGL4WQfVCXZbJD3ffwzOLQ7A3yoF6ddFohFgt0Ig==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/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://hubbletest.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/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://hubbletest.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1NFoXDTIwMTIwNTEwMjQ1NFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1mFR94qRsjGB+ukhqu+R/2fvZb9aQ39OrsNhQM8q22dtv8vK9X/ZX+Ym1Mv7/AVMCDwZhEVM2ioPFijk+hQAQQIDAQABo4GEMIGBMB0GA1UdDgQWBBTsJeuxItIS63xBOl92WQmpIgNm5jBSBgNVHSMESzBJgBTsJeuxItIS63xBOl92WQmpIgNm5qEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDjDsLXLLwXUTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EABXkSZKvoDu+elTr2M3Gcj0Igx0D2zaE2l7SW59JJLprHL0TGL4WQfVCXZbJD3ffwzOLQ7A3yoF6ddFohFgt0Ig==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se.xml b/swamid-1.0/hubbletest.ladok.umu.se.xml
index 8a925d67..e5ad3a10 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ DWzZe2mHU5s=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/hubbletest_idp-metadata.xml b/swamid-1.0/hubbletest_idp-metadata.xml
index 8f642930..a68f30e9 100644
--- a/swamid-1.0/hubbletest_idp-metadata.xml
+++ b/swamid-1.0/hubbletest_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://hubbletest.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAJysAH562fj7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAs3FGeb/F3/8sjtttoBQp3OcF2iFgcvOtI5cmVyBTx5b/5gKxEG9FO0xXO7QMhQ2zMFC4Xm1PNFrRMBo40w6zJQIDAQABo4GEMIGBMB0GA1UdDgQWBBRUvrXXPSrGYRgxbVxRfFR4MuP58DBSBgNVHSMESzBJgBRUvrXXPSrGYRgxbVxRfFR4MuP58KEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQCcrAB+etn4+zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAICH6MIvsZewQDhYz6U57cTdl06wlKAiBQdwZRJ7P4OCAZVjI66xSb47xd2qJcq+bxVxl+J6CY8d4PH2F9WunsQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://hubbletest.ladok.umu.se:8452/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://hubbletest.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8452/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://hubbletest.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAJysAH562fj7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAs3FGeb/F3/8sjtttoBQp3OcF2iFgcvOtI5cmVyBTx5b/5gKxEG9FO0xXO7QMhQ2zMFC4Xm1PNFrRMBo40w6zJQIDAQABo4GEMIGBMB0GA1UdDgQWBBRUvrXXPSrGYRgxbVxRfFR4MuP58DBSBgNVHSMESzBJgBRUvrXXPSrGYRgxbVxRfFR4MuP58KEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQCcrAB+etn4+zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAICH6MIvsZewQDhYz6U57cTdl06wlKAiBQdwZRJ7P4OCAZVjI66xSb47xd2qJcq+bxVxl+J6CY8d4PH2F9WunsQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://hubbletest.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/identity.mdh.se.xml b/swamid-1.0/identity.mdh.se.xml
index 390c7d33..3ac77e3e 100644
--- a/swamid-1.0/identity.mdh.se.xml
+++ b/swamid-1.0/identity.mdh.se.xml
@@ -1,31 +1,25 @@
-<EntityDescriptor entityID="https://identity.mdh.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Mälardalens högskola</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
- <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>mdh.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://identity.mdh.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Mälardalens högskola</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
+ <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>mdh.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
@@ -45,44 +39,26 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://identity.mdh.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://identity.mdh.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
@@ -102,21 +78,14 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://identity.mdh.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se: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">MDH</OrganizationName>
<OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
@@ -126,5 +95,4 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
<Company>Mälardalen University</Company>
<EmailAddress>peter.falck@mdh.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp-fre-1.eduid.se.xml b/swamid-1.0/idp-fre-1.eduid.se.xml
index 45b655ef..c0d390a5 100644
--- a/swamid-1.0/idp-fre-1.eduid.se.xml
+++ b/swamid-1.0/idp-fre-1.eduid.se.xml
@@ -1,5 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-fre-1.eduid.se/idp.xml"><ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:Extensions><ns1:Scope regexp="false">eduid.se</ns1:Scope></ns0:Extensions><ns0:KeyDescriptor use="encryption"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-fre-1.eduid.se/idp.xml">
+ <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <ns0:Extensions>
+ <ns1:Scope regexp="false">eduid.se</ns1:Scope>
+ </ns0:Extensions>
+ <ns0:KeyDescriptor use="encryption">
+ <ns2:KeyInfo>
+ <ns2:X509Data>
+ <ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0
WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr
@@ -14,7 +22,14 @@ ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx
N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/
6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu
97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw=
-</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="signing"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
+</ns2:X509Certificate>
+ </ns2:X509Data>
+ </ns2:KeyInfo>
+ </ns0:KeyDescriptor>
+ <ns0:KeyDescriptor use="signing">
+ <ns2:KeyInfo>
+ <ns2:X509Data>
+ <ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0
WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr
@@ -29,4 +44,32 @@ ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx
N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/
6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu
97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw=
-</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/slo/soap" /><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/slo/post" /><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/slo/redirect" /><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/sso/redirect" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/sso/post" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-fre-1.eduid.se/sso/art" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/sso/ecp" /></ns0:IDPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>eduID</ns0:GivenName><ns0:SurName>developers</ns0:SurName><ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>support@eduid.se</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>
+</ns2:X509Certificate>
+ </ns2:X509Data>
+ </ns2:KeyInfo>
+ </ns0:KeyDescriptor>
+ <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/slo/soap"/>
+ <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/slo/post"/>
+ <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/slo/redirect"/>
+ <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
+ <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+ <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/sso/redirect"/>
+ <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/sso/post"/>
+ <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-fre-1.eduid.se/sso/art"/>
+ <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/sso/ecp"/>
+ </ns0:IDPSSODescriptor>
+ <ns0:Organization>
+ <ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName>
+ <ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName>
+ <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
+ </ns0:Organization>
+ <ns0:ContactPerson contactType="technical">
+ <ns0:GivenName>eduID</ns0:GivenName>
+ <ns0:SurName>developers</ns0:SurName>
+ <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+ </ns0:ContactPerson>
+ <ns0:ContactPerson contactType="support">
+ <ns0:GivenName>Support</ns0:GivenName>
+ <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+ </ns0:ContactPerson>
+</ns0:EntityDescriptor>
diff --git a/swamid-1.0/idp-test.kau.se.xml b/swamid-1.0/idp-test.kau.se.xml
index 2868cdee..0886f1b2 100644
--- a/swamid-1.0/idp-test.kau.se.xml
+++ b/swamid-1.0/idp-test.kau.se.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.kau.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKDCCAhCgAwIBAgIVAL6+eYiH7vM1UZL2/N2xPdb4piT6MA0GCSqGSIb3DQEB
BQUAMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xMTEyMTQyMTAzMTVa
Fw0zMTEyMTQyMTAzMTVaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIw
@@ -30,36 +27,26 @@ MCUrqCvl40nvl7TfesM/0VOgrPiGi4fNt+hF5cPPVMUGC2buM8Ox2rsqg9Tr8klP
Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.kau.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.kau.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.kau.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.kau.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKDCCAhCgAwIBAgIVAL6+eYiH7vM1UZL2/N2xPdb4piT6MA0GCSqGSIb3DQEB
BQUAMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xMTEyMTQyMTAzMTVa
Fw0zMTEyMTQyMTAzMTVaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIw
@@ -79,19 +66,14 @@ MCUrqCvl40nvl7TfesM/0VOgrPiGi4fNt+hF5cPPVMUGC2buM8Ox2rsqg9Tr8klP
Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se: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">KAUTEST</OrganizationName>
<OrganizationDisplayName xml:lang="en">Karlstad university (Test IdP)</OrganizationDisplayName>
@@ -101,6 +83,4 @@ Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
<Company>KAU</Company>
<EmailAddress>paul.scott@kau.se</EmailAddress>
</ContactPerson>
-
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp-test.nordu.net.xml b/swamid-1.0/idp-test.nordu.net.xml
index ef06006a..7a77a589 100644
--- a/swamid-1.0/idp-test.nordu.net.xml
+++ b/swamid-1.0/idp-test.nordu.net.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.nordu.net/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
diff --git a/swamid-1.0/idp.bth.se.xml b/swamid-1.0/idp.bth.se.xml
index 026ec5f1..879f8670 100644
--- a/swamid-1.0/idp.bth.se.xml
+++ b/swamid-1.0/idp.bth.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp.bth.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.bth.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
@@ -33,44 +27,26 @@ DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.bth.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.bth.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bth.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
@@ -90,21 +66,14 @@ DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.bth.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se: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">BTH</OrganizationName>
<OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
@@ -115,5 +84,4 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
<SurName>Martinsson</SurName>
<EmailAddress>tom.martinsson@bth.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp.chalmers.se.xml b/swamid-1.0/idp.chalmers.se.xml
index ffca22cb..766bf3c6 100644
--- a/swamid-1.0/idp.chalmers.se.xml
+++ b/swamid-1.0/idp.chalmers.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.chalmers.se/adfs/services/trust">
<RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
<KeyDescriptor use="encryption">
@@ -331,5 +331,5 @@
<ContactPerson contactType="technical">
<Company>Chalmers</Company>
<EmailAddress>biorn@chalmers.se</EmailAddress>
- </ContactPerson>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/idp.hgo.se.xml b/swamid-1.0/idp.hgo.se.xml
index a621754a..c861ac14 100644
--- a/swamid-1.0/idp.hgo.se.xml
+++ b/swamid-1.0/idp.hgo.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp.hgo.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hgo.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
@@ -34,44 +28,26 @@ G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.hgo.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.hgo.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.hgo.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.hgo.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hgo.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hgo.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hgo.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
@@ -92,21 +68,15 @@ G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.hgo.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.se: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">HGO</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan på Gotland</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hgo.se</OrganizationURL>
@@ -116,5 +86,4 @@ UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
<SurName>Breiler</SurName>
<EmailAddress>joacim.breiler@hgo.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.hig.se.xml b/swamid-1.0/idp.hig.se.xml
index d7d0365d..418e5e69 100644
--- a/swamid-1.0/idp.hig.se.xml
+++ b/swamid-1.0/idp.hig.se.xml
@@ -1,30 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hig.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
- <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>hig.se</mdui:DomainHint>
- <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
- <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
- <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
- <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
+ <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hig.se</mdui:DomainHint>
+ <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
+ <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
@@ -44,36 +41,26 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
+eeRni4ggtByVTzg9fALQjDJydWcw0Oy
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
@@ -93,17 +80,13 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
+eeRni4ggtByVTzg9fALQjDJydWcw0Oy
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se: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">HIG</OrganizationName>
@@ -114,5 +97,4 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
<Company>Högskolan i Gävle</Company>
<EmailAddress>anders.lordal@hig.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp.his.se.xml b/swamid-1.0/idp.his.se.xml
index 26ddae4b..c4670149 100644
--- a/swamid-1.0/idp.his.se.xml
+++ b/swamid-1.0/idp.his.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp.his.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">his.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.his.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">his.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
@@ -33,44 +27,26 @@ hNY1IDFKGebFhCWmlG7MMPDm/omu6mBurSE9EAhVTretr0YXxmkfFrOvDysPOYWj
drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.his.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.his.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">his.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">his.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
@@ -90,20 +66,14 @@ hNY1IDFKGebFhCWmlG7MMPDm/omu6mBurSE9EAhVTretr0YXxmkfFrOvDysPOYWj
drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.his.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se: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">HIS</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan i Skövde</OrganizationDisplayName>
@@ -113,5 +83,4 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
<Company>Högskolan i Skövde</Company>
<EmailAddress>netadmin@his.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp.hkr.se.xml b/swamid-1.0/idp.hkr.se.xml
index 69a4c79a..d88772b4 100644
--- a/swamid-1.0/idp.hkr.se.xml
+++ b/swamid-1.0/idp.hkr.se.xml
@@ -1,16 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hkr.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
@@ -31,36 +28,26 @@ qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
@@ -81,19 +68,15 @@ qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se: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">HKR</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan Kristianstad</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hkr.se</OrganizationURL>
@@ -102,5 +85,4 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
<Company>Högskolan Kristianstad</Company>
<EmailAddress>roland.svedman@hkr.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp.irf.se.xml b/swamid-1.0/idp.irf.se.xml
index 4af44cad..3bc56d52 100644
--- a/swamid-1.0/idp.irf.se.xml
+++ b/swamid-1.0/idp.irf.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp.irf.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.irf.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAPBjklkGoYOts1Thq2Tib2SW7KLrMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5pcmYuc2UwHhcNMTEwMjE1MDgwODE2WhcNMTQw
MjE1MDgwODE2WjAVMRMwEQYDVQQDEwppZHAuaXJmLnNlMIIBIjANBgkqhkiG9w0B
@@ -33,44 +27,26 @@ F84dF7JlnXcS7kJj9sVwzWyEzR4GlpZQLTuucQqAWabMtOe8VDBkTIAj5xdNJgZp
dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.irf.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.irf.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irf.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irf.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAPBjklkGoYOts1Thq2Tib2SW7KLrMA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5pcmYuc2UwHhcNMTEwMjE1MDgwODE2WhcNMTQw
MjE1MDgwODE2WjAVMRMwEQYDVQQDEwppZHAuaXJmLnNlMIIBIjANBgkqhkiG9w0B
@@ -90,20 +66,14 @@ F84dF7JlnXcS7kJj9sVwzWyEzR4GlpZQLTuucQqAWabMtOe8VDBkTIAj5xdNJgZp
dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.irf.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.se: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">IRF</OrganizationName>
<OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
@@ -114,5 +84,4 @@ dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
<SurName>Luspa</SurName>
<EmailAddress>matsl@irf.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.it.gu.se.xml b/swamid-1.0/idp.it.gu.se.xml
index 8e837238..589c1f58 100644
--- a/swamid-1.0/idp.it.gu.se.xml
+++ b/swamid-1.0/idp.it.gu.se.xml
@@ -1,30 +1,25 @@
-<EntityDescriptor entityID="https://idp.it.gu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Göteborgs universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
- <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
- <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>gu.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.it.gu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Göteborgs universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>gu.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
@@ -44,44 +39,26 @@ CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.it.gu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.it.gu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
@@ -101,21 +78,14 @@ CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.it.gu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se: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">GU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Göteborgs universitet</OrganizationDisplayName>
@@ -125,5 +95,4 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
<Company>Göteborgs universitet</Company>
<EmailAddress>pablo.millet@gu.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.it.su.se.xml b/swamid-1.0/idp.it.su.se.xml
index d809b2f3..f8eeb2a2 100644
--- a/swamid-1.0/idp.it.su.se.xml
+++ b/swamid-1.0/idp.it.su.se.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.it.su.se/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">su.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Stockholms universitet.</mdui:Description>
- <mdui:Description xml:lang="en">The Stockholm University Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:Logo xml:lang="sv" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
- <mdui:Logo xml:lang="en" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
+ <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Stockholms universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">The Stockholm University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Logo xml:lang="sv" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>su.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
+ <mdui:DomainHint>su.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
</mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-1.0/idp.kau.se-saml2.xml b/swamid-1.0/idp.kau.se-saml2.xml
index a2b9a950..ab880659 100644
--- a/swamid-1.0/idp.kau.se-saml2.xml
+++ b/swamid-1.0/idp.kau.se-saml2.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
- <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
</md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-1.0/idp.kau.se.xml b/swamid-1.0/idp.kau.se.xml
index 17cb8b4a..eec3e018 100644
--- a/swamid-1.0/idp.kau.se.xml
+++ b/swamid-1.0/idp.kau.se.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
<IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-1.0/idp.lhs.se.xml b/swamid-1.0/idp.lhs.se.xml
index 0b6b0a9c..d7b520c3 100644
--- a/swamid-1.0/idp.lhs.se.xml
+++ b/swamid-1.0/idp.lhs.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lhs.se/identity">
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
diff --git a/swamid-1.0/idp.lnu.se.xml b/swamid-1.0/idp.lnu.se.xml
index efb22533..db815b90 100644
--- a/swamid-1.0/idp.lnu.se.xml
+++ b/swamid-1.0/idp.lnu.se.xml
@@ -1,30 +1,24 @@
-<EntityDescriptor entityID="https://idp.lnu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">lnu.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Linnéuniversitetet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Linnæus University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Linnéuniversitetet.</mdui:Description>
- <mdui:Description xml:lang="en">The Linnæus University Identity Provider is used by employees and students at the university.</mdui:Description>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>lnu.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:56.6661,16.3484</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:56.8546,14.8304</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.lnu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">lnu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Linnéuniversitetet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Linnæus University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Linnéuniversitetet.</mdui:Description>
+ <mdui:Description xml:lang="en">The Linnæus University Identity Provider is used by employees and students at the university.</mdui:Description>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>lnu.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:56.6661,16.3484</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:56.8546,14.8304</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
@@ -52,44 +46,26 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
1qXbJLIBEw2yRiL7ayAgirIbuJUR/7+zQVxYX9NyJw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.lnu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.lnu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.lnu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.lnu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">lnu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lnu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lnu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lnu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lnu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">lnu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
@@ -117,21 +93,14 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
1qXbJLIBEw2yRiL7ayAgirIbuJUR/7+zQVxYX9NyJw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.lnu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se: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">LNU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Linnéuniversitetet</OrganizationDisplayName>
@@ -141,5 +110,4 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
<Company>Linnéuniversitetet</Company>
<EmailAddress>it.idp@lnu.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.mah.se.xml b/swamid-1.0/idp.mah.se.xml
index 1014eda0..55b95bbc 100644
--- a/swamid-1.0/idp.mah.se.xml
+++ b/swamid-1.0/idp.mah.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp.mah.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.mah.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
@@ -33,44 +27,26 @@ Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.mah.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.mah.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mah.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mah.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
@@ -90,22 +66,15 @@ Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.mah.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.se: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">MAH</OrganizationName>
<OrganizationDisplayName xml:lang="en">Malmö Högskola</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>
@@ -115,5 +84,4 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
<SurName>Faling</SurName>
<EmailAddress>robert.faling@mah.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.nordu.net.xml b/swamid-1.0/idp.nordu.net.xml
index bcf45211..13f1088e 100644
--- a/swamid-1.0/idp.nordu.net.xml
+++ b/swamid-1.0/idp.nordu.net.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.nordu.net/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
diff --git a/swamid-1.0/idp.secure.su.se.xml b/swamid-1.0/idp.secure.su.se.xml
index 5450b443..64d32d23 100644
--- a/swamid-1.0/idp.secure.su.se.xml
+++ b/swamid-1.0/idp.secure.su.se.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.secure.su.se/identity">
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
- <shibmeta:Scope regexp="false" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">su.se</shibmeta:Scope>
+ <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -16,7 +16,7 @@
</AttributeAuthorityDescriptor>
<IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
- <shibmeta:Scope regexp="false" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">su.se</shibmeta:Scope>
+ <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/idp.student.bth.se.xml b/swamid-1.0/idp.student.bth.se.xml
index aa4bf9e0..15d5f744 100644
--- a/swamid-1.0/idp.student.bth.se.xml
+++ b/swamid-1.0/idp.student.bth.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp.student.bth.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.student.bth.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
@@ -31,44 +25,26 @@ E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
4NzN1iC8kg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.student.bth.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.student.bth.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
@@ -86,21 +62,15 @@ E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
4NzN1iC8kg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.student.bth.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se: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">STUDENTS-BTH</OrganizationName>
<OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
@@ -110,5 +80,4 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
<SurName>Martinsson</SurName>
<EmailAddress>tom.martinsson@bth.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.suni.se.xml b/swamid-1.0/idp.suni.se.xml
index 74badc37..87016da9 100644
--- a/swamid-1.0/idp.suni.se.xml
+++ b/swamid-1.0/idp.suni.se.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.suni.se/adfs/services/trust">
<Extensions>
<shibmd:Scope regexp="false">suni.se</shibmd:Scope>
</Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><Extensions><shibmd:Scope regexp="false">suni.se</shibmd:Scope></Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
+ </Extensions>
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
diff --git a/swamid-1.0/idp.test.umu.se.xml b/swamid-1.0/idp.test.umu.se.xml
index 923f1431..9b301645 100644
--- a/swamid-1.0/idp.test.umu.se.xml
+++ b/swamid-1.0/idp.test.umu.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.test.umu.se/identity">
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
diff --git a/swamid-1.0/idp.umu.se-saml1.xml b/swamid-1.0/idp.umu.se-saml1.xml
index e8b61e4e..500b3a78 100644
--- a/swamid-1.0/idp.umu.se-saml1.xml
+++ b/swamid-1.0/idp.umu.se-saml1.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/shib13/idp/metadata.php">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
</ds:X509Data>
@@ -21,8 +21,8 @@
<md:Organization>
<md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
<md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML1)</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML1)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Umeå University (SAML1)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="se">Umeå universitet (SAML1)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
<md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-1.0/idp.umu.se-saml2.xml b/swamid-1.0/idp.umu.se-saml2.xml
index 1bd6b6a6..5650f360 100644
--- a/swamid-1.0/idp.umu.se-saml2.xml
+++ b/swamid-1.0/idp.umu.se-saml2.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/saml2/idp/metadata.php">
<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">umu.se</shibmd:Scope>
+ <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
</md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
</ds:X509Data>
@@ -26,8 +26,8 @@
<md:Organization>
<md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
<md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="se">Umeå universitet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
<md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-1.0/idp1.irf.se.xml b/swamid-1.0/idp1.irf.se.xml
index c549db94..3e14b10f 100644
--- a/swamid-1.0/idp1.irf.se.xml
+++ b/swamid-1.0/idp1.irf.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idp1.irf.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.irf.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFzCCAf+gAwIBAgIUc74js9dRvbf1KNNKFdoKAZ3Td2cwDQYJKoZIhvcNAQEF
BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzEwMTI1NzQxWhcNMzAw
MzEwMTI1NzQxWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
@@ -33,44 +27,26 @@ pmmsdRKvHmnn0lzvLPkt4I0TjJ1mjC76HfMswn2LZF3sRDpU+O+dvJVJTdXgXD7C
s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp1.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp1.irf.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp1.irf.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp1.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp1.irf.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.irf.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.irf.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.irf.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFzCCAf+gAwIBAgIUc74js9dRvbf1KNNKFdoKAZ3Td2cwDQYJKoZIhvcNAQEF
BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzEwMTI1NzQxWhcNMzAw
MzEwMTI1NzQxWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
@@ -90,21 +66,15 @@ pmmsdRKvHmnn0lzvLPkt4I0TjJ1mjC76HfMswn2LZF3sRDpU+O+dvJVJTdXgXD7C
s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp1.irf.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.irf.se: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">IRF</OrganizationName>
<OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
@@ -114,5 +84,4 @@ s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
<SurName>Luspa</SurName>
<EmailAddress>matsl@irf.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp1.unit.liu.se.xml b/swamid-1.0/idp1.unit.liu.se.xml
index 1fb49071..02bffddc 100644
--- a/swamid-1.0/idp1.unit.liu.se.xml
+++ b/swamid-1.0/idp1.unit.liu.se.xml
@@ -1,19 +1,13 @@
- <EntityDescriptor entityID="https://idp1.unit.liu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.unit.liu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKzCCAhOgAwIBAgIUL9NrL6v4aXTO+WnTc/pTLVej0o8wDQYJKoZIhvcNAQEF
BQAwGzEZMBcGA1UEAxMQaWRwMS51bml0LmxpdS5zZTAeFw0wOTA2MjUwNjIxMTRa
Fw0yOTA2MjUwNjIxMTRaMBsxGTAXBgNVBAMTEGlkcDEudW5pdC5saXUuc2UwggEi
@@ -33,44 +27,26 @@ bZoWErCv/72HTScd6cjOwu6He4nAraDiTcqobdMUVQ61dm425OQFcdqpNx6uCC4F
dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp1.unit.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp1.unit.liu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp1.unit.liu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.unit.liu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.unit.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKzCCAhOgAwIBAgIUL9NrL6v4aXTO+WnTc/pTLVej0o8wDQYJKoZIhvcNAQEF
BQAwGzEZMBcGA1UEAxMQaWRwMS51bml0LmxpdS5zZTAeFw0wOTA2MjUwNjIxMTRa
Fw0yOTA2MjUwNjIxMTRaMBsxGTAXBgNVBAMTEGlkcDEudW5pdC5saXUuc2UwggEi
@@ -90,21 +66,14 @@ bZoWErCv/72HTScd6cjOwu6He4nAraDiTcqobdMUVQ61dm425OQFcdqpNx6uCC4F
dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp1.unit.liu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.unit.liu.se: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">LiU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Linköping University (TEST IdP)</OrganizationDisplayName>
@@ -114,5 +83,4 @@ dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
<Company>Linköping University</Company>
<EmailAddress>jonathan.sussemilch.poulain@liu.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp2.hig.se.xml b/swamid-1.0/idp2.hig.se.xml
index 7f6301fe..86717c23 100644
--- a/swamid-1.0/idp2.hig.se.xml
+++ b/swamid-1.0/idp2.hig.se.xml
@@ -1,26 +1,20 @@
-<EntityDescriptor entityID="https://idp2.hig.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description>
- <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni at the university.</mdui:Description>
- <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2.hig.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description>
+ <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni at the university.</mdui:Description>
+ <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
@@ -40,44 +34,26 @@ FC8se9RzTAIwV0P7WorYzwt95Xa9K8DDeLxjheJ3inQR07CD2unOV67Sp5YEfM61
aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp2.hig.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp2.hig.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp2.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp2.hig.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hig.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hig.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hig.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
@@ -97,21 +73,15 @@ FC8se9RzTAIwV0P7WorYzwt95Xa9K8DDeLxjheJ3inQR07CD2unOV67Sp5YEfM61
aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp2.hig.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se: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">HIGALUMNI</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan i Gävle (Alumni)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
@@ -120,5 +90,4 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
<Company>Högskolan i Gävle</Company>
<EmailAddress>anders.lordal@hig.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/idp2.hv.se.xml b/swamid-1.0/idp2.hv.se.xml
index 2b2fed05..e29ce4b4 100644
--- a/swamid-1.0/idp2.hv.se.xml
+++ b/swamid-1.0/idp2.hv.se.xml
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2.hv.se/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
- <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>hv.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
+ <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hv.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
@@ -40,36 +38,26 @@ dqEra6A3S5DN0BAWsLH3aBkA3fL/f6f3HUQwmd7dG+OUOtP+5DaB1YdeeXYMz5Wj
aRQKNbVQdPN5ht6TrINjDQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hv.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hv.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hv.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hv.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hv.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hv.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
@@ -90,38 +78,32 @@ dqEra6A3S5DN0BAWsLH3aBkA3fL/f6f3HUQwmd7dG+OUOtP+5DaB1YdeeXYMz5Wj
aRQKNbVQdPN5ht6TrINjDQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se: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">HV</OrganizationName>
- <OrganizationName xml:lang="sv">HV</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="administrative">
- <Company>Högskolan Väst</Company>
- <GivenName>Magnus</GivenName>
- <SurName>Andersson</SurName>
- <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <Company>Högskolan Väst</Company>
- <GivenName>Christian</GivenName>
- <SurName>Jiresjö</SurName>
- <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
- </ContactPerson>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se: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">HV</OrganizationName>
+ <OrganizationName xml:lang="sv">HV</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Högskolan Väst</Company>
+ <GivenName>Magnus</GivenName>
+ <SurName>Andersson</SurName>
+ <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Högskolan Väst</Company>
+ <GivenName>Christian</GivenName>
+ <SurName>Jiresjö</SurName>
+ <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/idp2.kau.se.xml b/swamid-1.0/idp2.kau.se.xml
index 181a792a..a07393bf 100644
--- a/swamid-1.0/idp2.kau.se.xml
+++ b/swamid-1.0/idp2.kau.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2.kau.se/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
@@ -6,7 +6,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider f&#xF6;r Karlstads universitet</mdui:Description>
+ <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
<mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
</mdui:UIInfo>
diff --git a/swamid-1.0/idptest.test.it.gu.se.xml b/swamid-1.0/idptest.test.it.gu.se.xml
index 98d2392c..3c0c759e 100644
--- a/swamid-1.0/idptest.test.it.gu.se.xml
+++ b/swamid-1.0/idptest.test.it.gu.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://idptest.test.it.gu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idptest.test.it.gu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDQDCCAiigAwIBAgIVAMzlV6IV/VX2recEXh63q+uHSZXJMA0GCSqGSIb3DQEB
BQUAMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5pdC5ndS5zZTAeFw0xMTAxMTcx
MjIwMzhaFw0zMTAxMTcxMjIwMzhaMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5p
@@ -34,44 +28,26 @@ uQLGuCOUO1cwGMeLDC2NSoiRG4VFWeSK1TaxWrorLp6X0B/A9gFIdULMHGRP+sou
yGhhtAniGS37iPTX33D0GyJ0d4U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idptest.test.it.gu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idptest.test.it.gu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idptest.test.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idptest.test.it.gu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.test.it.gu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.test.it.gu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.test.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.test.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDQDCCAiigAwIBAgIVAMzlV6IV/VX2recEXh63q+uHSZXJMA0GCSqGSIb3DQEB
BQUAMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5pdC5ndS5zZTAeFw0xMTAxMTcx
MjIwMzhaFw0zMTAxMTcxMjIwMzhaMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5p
@@ -92,19 +68,12 @@ uQLGuCOUO1cwGMeLDC2NSoiRG4VFWeSK1TaxWrorLp6X0B/A9gFIdULMHGRP+sou
yGhhtAniGS37iPTX33D0GyJ0d4U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idptest.test.it.gu.se: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>
-
-</EntityDescriptor> \ No newline at end of file
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.test.it.gu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/iidp3.hv.se.xml b/swamid-1.0/iidp3.hv.se.xml
index ac953ec2..e0edfb9e 100644
--- a/swamid-1.0/iidp3.hv.se.xml
+++ b/swamid-1.0/iidp3.hv.se.xml
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp3.hv.se/idp/shibboleth">
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University West (Test)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Högskolan Väst (Test)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
- <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>hv.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University West (Test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan Väst (Test)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
+ <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hv.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDPDCCAiSgAwIBAgIVAKTQIrf9LxcGt46niDqiM7jwkFfgMA0GCSqGSIb3DQEB
BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDQuc2VydmVyLmh2LnNlMB4XDTEyMTEzMDEz
MDU1MFoXDTMyMTEzMDEzMDU1MFowHzEdMBsGA1UEAxMUbHNhbWwwNC5zZXJ2ZXIu
@@ -40,36 +38,26 @@ h45FsOw64riDT7QFrR9PvAvJhhpD7Q7NX+dZUQNnj0oyFZij3k6A36D5eENhf5HN
skz1W+/eg2IbITbz88uIXA==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.hv.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.hv.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.hv.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.hv.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.hv.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.hv.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDPDCCAiSgAwIBAgIVAKTQIrf9LxcGt46niDqiM7jwkFfgMA0GCSqGSIb3DQEB
BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDQuc2VydmVyLmh2LnNlMB4XDTEyMTEzMDEz
MDU1MFoXDTMyMTEzMDEzMDU1MFowHzEdMBsGA1UEAxMUbHNhbWwwNC5zZXJ2ZXIu
@@ -90,38 +78,32 @@ h45FsOw64riDT7QFrR9PvAvJhhpD7Q7NX+dZUQNnj0oyFZij3k6A36D5eENhf5HN
skz1W+/eg2IbITbz88uIXA==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se: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">HV</OrganizationName>
- <OrganizationName xml:lang="sv">HV</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University West (Test)</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">Högskolan Väst (Test)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="administrative">
- <Company>Högskolan Väst</Company>
- <GivenName>Magnus</GivenName>
- <SurName>Andersson</SurName>
- <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <Company>Högskolan Väst</Company>
- <GivenName>Christian</GivenName>
- <SurName>Jiresjö</SurName>
- <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
- </ContactPerson>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se: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">HV</OrganizationName>
+ <OrganizationName xml:lang="sv">HV</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University West (Test)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Högskolan Väst (Test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Högskolan Väst</Company>
+ <GivenName>Magnus</GivenName>
+ <SurName>Andersson</SurName>
+ <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Högskolan Väst</Company>
+ <GivenName>Christian</GivenName>
+ <SurName>Jiresjö</SurName>
+ <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/ilearn.dsv.su.se.xml b/swamid-1.0/ilearn.dsv.su.se.xml
index e130cf04..4bfc76d3 100644
--- a/swamid-1.0/ilearn.dsv.su.se.xml
+++ b/swamid-1.0/ilearn.dsv.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ilearn.dsv.su.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -75,5 +74,4 @@ TBh7fImpEOudLS4QjaA5rtWj2ytVmBe/91pCYVUjqef5JA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilearn.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ilearn.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml
index 0ae6e92c..26cda097 100644
--- a/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/aws-sp-en">
-
<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://it11.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ a8TzyNruiLmHHg+q81vk7tcfYU0jiHu53BASFkkDzvwseHLdh6MV+HcuJUC+DSii
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-aws-sp.xml b/swamid-1.0/it11.ladok.umu.se-aws-sp.xml
index 0c3c0bfb..f1d546a0 100644
--- a/swamid-1.0/it11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/it11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-dw-idp.xml b/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
index 195cd70d..94d942f8 100644
--- a/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/it11.ladok.umu.se-ecs-sp.xml
index 5d95fb99..68922e62 100644
--- a/swamid-1.0/it11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/it11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
index 0c301aaf..82c11641 100644
--- a/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/it11_idp-metadata.xml b/swamid-1.0/it11_idp-metadata.xml
index 0556d047..1881bb00 100644
--- a/swamid-1.0/it11_idp-metadata.xml
+++ b/swamid-1.0/it11_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://it11.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJANvKImxOFvyVMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAviV3q8RgER4oeYk7i9B6tgvoI+GJuqNfGHYMANEFv3/+tylDE2JkoodqpgAAEBnrd6HybpNq2kWiXLZhb+QVXQIDAQABo30wezAdBgNVHQ4EFgQUcAgBRmQ1ot38QuGh/mpPR8QRWZ8wTAYDVR0jBEUwQ4AUcAgBRmQ1ot38QuGh/mpPR8QRWZ+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkA28oibE4W/JUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH2e2VAkeKqk+zeEmKxpIAHm6KapHTEXRgRXP/BHTaytofyqugKrJWft/MjpSuINkUy4AUXgf9xgf1QoWg2CfM8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://it11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://it11.ladok.umu.se:8452/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://it11.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8452/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://it11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJANvKImxOFvyVMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAviV3q8RgER4oeYk7i9B6tgvoI+GJuqNfGHYMANEFv3/+tylDE2JkoodqpgAAEBnrd6HybpNq2kWiXLZhb+QVXQIDAQABo30wezAdBgNVHQ4EFgQUcAgBRmQ1ot38QuGh/mpPR8QRWZ8wTAYDVR0jBEUwQ4AUcAgBRmQ1ot38QuGh/mpPR8QRWZ+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkA28oibE4W/JUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH2e2VAkeKqk+zeEmKxpIAHm6KapHTEXRgRXP/BHTaytofyqugKrJWft/MjpSuINkUy4AUXgf9xgf1QoWg2CfM8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://it11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://it11.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/its-pd0001.ad.umu.se.xml b/swamid-1.0/its-pd0001.ad.umu.se.xml
index f7a80891..e2dfe2ed 100644
--- a/swamid-1.0/its-pd0001.ad.umu.se.xml
+++ b/swamid-1.0/its-pd0001.ad.umu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-pd0001.ad.umu.se/shibboleth">
-
<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://its-pd0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -59,5 +59,4 @@ qo9cBPEaTnL1Lr1ecg2/SlL0KYppyWk=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/its-pd0030.ad.umu.se.xml b/swamid-1.0/its-pd0030.ad.umu.se.xml
index 8bb619c9..95f0e529 100644
--- a/swamid-1.0/its-pd0030.ad.umu.se.xml
+++ b/swamid-1.0/its-pd0030.ad.umu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-pd0030.ad.umu.se/shibboleth">
-
<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://its-pd0030.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -59,5 +59,4 @@ OIILi2tdLnboWi1QOOeX9+Q=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-pd0030.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-pd0030.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/its-pd0062.ad.umu.se.xml b/swamid-1.0/its-pd0062.ad.umu.se.xml
index 2436fada..87ea54c1 100644
--- a/swamid-1.0/its-pd0062.ad.umu.se.xml
+++ b/swamid-1.0/its-pd0062.ad.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-pd0062.ad.umu.se/shibboleth-sp">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/IDP"/>
@@ -51,5 +50,4 @@ XF6Xb2bzkg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/jabber.nordu.net.xml b/swamid-1.0/jabber.nordu.net.xml
index 0aa3a8b2..fb6c4bd0 100644
--- a/swamid-1.0/jabber.nordu.net.xml
+++ b/swamid-1.0/jabber.nordu.net.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jabber.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jabber.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
@@ -70,13 +69,13 @@ zvTzeciRKJ9UNf9ibAJGF7jz/GP5r+yUgizdV0wyikyUa8VNyrSeExBUVg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Jabber at NORDUnet</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Jabber at NORDUnet</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:ServiceName xml:lang="en">Jabber at NORDUnet</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Jabber at NORDUnet</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-1.0/jira-test.it.su.se.xml b/swamid-1.0/jira-test.it.su.se.xml
index a5aa7368..8449c4f4 100644
--- a/swamid-1.0/jira-test.it.su.se.xml
+++ b/swamid-1.0/jira-test.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-test.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ SKTYQay0lG3RNe7C3dTRD2RvZznqpkhRVqNqWJHGdfuP4uiVfQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/jira.it.su.se.xml b/swamid-1.0/jira.it.su.se.xml
index f7ec32f3..e7527c99 100644
--- a/swamid-1.0/jira.it.su.se.xml
+++ b/swamid-1.0/jira.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ FdYOem7PdnMNtROBFXZZ+vv1hrOfYBy7FrvBe49J9Yub+jaHWw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/kib.ki.se.xml b/swamid-1.0/kib.ki.se.xml
index 2233fea6..baa4cbc8 100644
--- a/swamid-1.0/kib.ki.se.xml
+++ b/swamid-1.0/kib.ki.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kib.ki.se/shibboleth">
-
<md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -87,5 +86,4 @@ qQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/kiidp.ki.se.xml b/swamid-1.0/kiidp.ki.se.xml
index cc5cf91c..2348f570 100644
--- a/swamid-1.0/kiidp.ki.se.xml
+++ b/swamid-1.0/kiidp.ki.se.xml
@@ -1,19 +1,13 @@
-<md:EntityDescriptor entityID="https://kiidp.ki.se/idp/shibboleth"
- xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <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 regexp="false">ki.se</shibmd:Scope>
- </md:Extensions>
-
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://kiidp.ki.se/idp/shibboleth">
+ <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 regexp="false">ki.se</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
@@ -33,44 +27,26 @@ y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
-
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO" />
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO" />
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://kiidp.ki.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 regexp="false">ki.se</shibmd:Scope>
- </md:Extensions>
-
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.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 regexp="false">ki.se</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
@@ -90,21 +66,14 @@ y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
-
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://kiidp.ki.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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.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">KI</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
@@ -114,5 +83,4 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
<md:Company>Karolinska Institutet</md:Company>
<md:EmailAddress>it-support@ki.se</md:EmailAddress>
</md:ContactPerson>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/kiladokdev.it.ki.se.xml b/swamid-1.0/kiladokdev.it.ki.se.xml
index 7d817a98..d48acc05 100644
--- a/swamid-1.0/kiladokdev.it.ki.se.xml
+++ b/swamid-1.0/kiladokdev.it.ki.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiladokdev.it.ki.se/shibboleth">
-
<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://kiladokdev.it.ki.se/Shibboleth.sso/Login"/>
@@ -44,5 +43,4 @@ T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/kiladoktest.it.ki.se.xml b/swamid-1.0/kiladoktest.it.ki.se.xml
index 2272bf09..8dbe8f6e 100644
--- a/swamid-1.0/kiladoktest.it.ki.se.xml
+++ b/swamid-1.0/kiladoktest.it.ki.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiladoktest.it.ki.se/shibboleth">
-
<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://kiladoktest.it.ki.se/Shibboleth.sso/Login"/>
@@ -44,5 +43,4 @@ e01/KT+BtiGpAdoAUA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/kilwdev.it.ki.se.xml b/swamid-1.0/kilwdev.it.ki.se.xml
index 4f9c2a4e..fef2975f 100644
--- a/swamid-1.0/kilwdev.it.ki.se.xml
+++ b/swamid-1.0/kilwdev.it.ki.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilwdev.it.ki.se/shibboleth">
-
<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="http://kilwdev.it.ki.se/Shibboleth.sso/Login"/>
@@ -45,5 +45,4 @@ T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/kurser.math.su.se.xml b/swamid-1.0/kurser.math.su.se.xml
index 14dbb550..5f5a0956 100644
--- a/swamid-1.0/kurser.math.su.se.xml
+++ b/swamid-1.0/kurser.math.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurser.math.su.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -83,5 +82,4 @@ orcBunWAqfoXXOHt4HTclLpL01R8y9T5LvZBWpEN75u3fkRHWS/kQIXHprWp07xv
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurser.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurser.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/kurser3.math.su.se.xml b/swamid-1.0/kurser3.math.su.se.xml
index 8d881e8a..25906657 100644
--- a/swamid-1.0/kurser3.math.su.se.xml
+++ b/swamid-1.0/kurser3.math.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurser3.math.su.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -83,5 +82,4 @@ cltjAaJBgU+QoDEuKsQtzVwmR/JfWYaVaMDXCh+QwOgvP3MIq8pA
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/labs.swami.se.xml b/swamid-1.0/labs.swami.se.xml
index ce2437bb..d61425a4 100644
--- a/swamid-1.0/labs.swami.se.xml
+++ b/swamid-1.0/labs.swami.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://labs.swami.se">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/ladok-test.su.se.xml b/swamid-1.0/ladok-test.su.se.xml
index 80411149..d0b8e327 100644
--- a/swamid-1.0/ladok-test.su.se.xml
+++ b/swamid-1.0/ladok-test.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok-test.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok-test.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ fPPBQCZRQrV5zV0+mNOLgZEjYh4zXLJOA4dDFYq2gg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok.su.se.xml b/swamid-1.0/ladok.su.se.xml
index b275d123..02b43720 100644
--- a/swamid-1.0/ladok.su.se.xml
+++ b/swamid-1.0/ladok.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ R3H6+4G4tQJixe4WRSG0z0Z1inVFppE5WqimH/Cp4Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
index db931890..0296f2df 100644
--- a/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-00.ladok.umu.se/gui-sp">
-
<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://ladok3-00.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ w5aKug==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml
index fbe266ba..94fb3d7f 100644
--- a/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-00.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-00.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAPWmpqFS/L0HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwMzM3WhcNMjIwNjI0MTMwMzM3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKRR5KotOWLu7l6muQ79UgiWCVnDlhlDHvP35Pr6+l+qYNYOs/7Tj3AxqVZ5VbHBcAs3Jy24FLaehvXgEJEXCUMCAwEAAaNQME4wHQYDVR0OBBYEFFpKhfUOvkIupy7lxNKwx/Z9zyAmMB8GA1UdIwQYMBaAFFpKhfUOvkIupy7lxNKwx/Z9zyAmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIAnEcvv6+3f+bKtnTqFKwKFXtt23jyFkFyYC7wMnNiFFhzgu/AhVhT5lcokjyrIl/klOWfWQ9xjBWHCWuhiRg
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-00.ladok.umu.se:8445/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://ladok3-00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8445/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://ladok3-00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAPWmpqFS/L0HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwMzM3WhcNMjIwNjI0MTMwMzM3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKRR5KotOWLu7l6muQ79UgiWCVnDlhlDHvP35Pr6+l+qYNYOs/7Tj3AxqVZ5VbHBcAs3Jy24FLaehvXgEJEXCUMCAwEAAaNQME4wHQYDVR0OBBYEFFpKhfUOvkIupy7lxNKwx/Z9zyAmMB8GA1UdIwQYMBaAFFpKhfUOvkIupy7lxNKwx/Z9zyAmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIAnEcvv6+3f+bKtnTqFKwKFXtt23jyFkFyYC7wMnNiFFhzgu/AhVhT5lcokjyrIl/klOWfWQ9xjBWHCWuhiRg
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-00.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml
index 21eb6184..4a342d44 100644
--- a/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-01.ladok.umu.se/gui-sp">
-
<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://ladok3-01.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ p012eg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml
index 708600b9..f22f9be3 100644
--- a/swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-01.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-01.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAMCbtfYJ5dzmMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTEzODEwWhcNMjIwNjI3MTEzODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANPI+aER/JhQjlhBqISUes5kVWGa/hSWGdzXmIn817nylLopgXSXTBw6YRuP4P0wM+xFB16yAfPMtXPgNiPwdjMCAwEAAaNQME4wHQYDVR0OBBYEFGvBTsJT1+qJRruTgfjVEOW3QLL8MB8GA1UdIwQYMBaAFGvBTsJT1+qJRruTgfjVEOW3QLL8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQA4KSyXYAg53OX66SCMR15MdMzIOwZezi3/Ofx6A0fxomSigTr1lI8txl3WrgCgjZl1M9XXjt2MsTKvtUp1ua+Z
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-01.ladok.umu.se:8445/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://ladok3-01.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:8445/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://ladok3-01.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAMCbtfYJ5dzmMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTEzODEwWhcNMjIwNjI3MTEzODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANPI+aER/JhQjlhBqISUes5kVWGa/hSWGdzXmIn817nylLopgXSXTBw6YRuP4P0wM+xFB16yAfPMtXPgNiPwdjMCAwEAAaNQME4wHQYDVR0OBBYEFGvBTsJT1+qJRruTgfjVEOW3QLL8MB8GA1UdIwQYMBaAFGvBTsJT1+qJRruTgfjVEOW3QLL8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQA4KSyXYAg53OX66SCMR15MdMzIOwZezi3/Ofx6A0fxomSigTr1lI8txl3WrgCgjZl1M9XXjt2MsTKvtUp1ua+Z
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-01.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml
index 4e83ce62..a1a0c69e 100644
--- a/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-02.ladok.umu.se/gui-sp">
-
<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://ladok3-02.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ BeVqTg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml
index 678fda1c..ef96321f 100644
--- a/swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-02.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-02.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAJRGZvEIQDmEMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA2WhcNMjIwNjI3MTIwODA2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5ZNsDNc3TF2GoQi/WwkMz059rKCZOVbUmSQGcmvCn11x5zx825ffuQ6j+de7i2Vv4uvfIAfWwrEYR1GHtg1usCAwEAAaNQME4wHQYDVR0OBBYEFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMB8GA1UdIwQYMBaAFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCjNnOVcciOtqeqZeNhXaIzKbYPapti/pZLQ52dU6dVxIzKOA0w1XZCHZJ/sxCkGxk9ocIo3u5N77BhU25ByLks
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-02.ladok.umu.se:8445/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://ladok3-02.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se:8445/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://ladok3-02.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAJRGZvEIQDmEMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA2WhcNMjIwNjI3MTIwODA2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5ZNsDNc3TF2GoQi/WwkMz059rKCZOVbUmSQGcmvCn11x5zx825ffuQ6j+de7i2Vv4uvfIAfWwrEYR1GHtg1usCAwEAAaNQME4wHQYDVR0OBBYEFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMB8GA1UdIwQYMBaAFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCjNnOVcciOtqeqZeNhXaIzKbYPapti/pZLQ52dU6dVxIzKOA0w1XZCHZJ/sxCkGxk9ocIo3u5N77BhU25ByLks
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-02.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml
index 89201ade..855b100c 100644
--- a/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-03.ladok.umu.se/gui-sp">
-
<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://ladok3-03.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ OqxKbw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml
index 179ca8aa..62ea17e2 100644
--- a/swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-03.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-03.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJALb4QvoyypFOMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA4WhcNMjIwNjI3MTIwODA4WjAhMR8wHQYDVQQDDBZsYWRvazMtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHxkmrGQNtgj0R5i17tm7OmmpKXk6Q2DZKTWcAQN3zZKbjqw0w9z7bNrtEJSPEmLKCfuIAFvoYTkik1LJ+VoQsCAwEAAaNQME4wHQYDVR0OBBYEFHGGau5hX0do3t9pCv2HMEESPS3iMB8GA1UdIwQYMBaAFHGGau5hX0do3t9pCv2HMEESPS3iMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDCPzJ64aeJ0eOoRW71p++Ij9qYw5KhDV7ITwTNzs0IhMIkMQvt9sJ83d22rYbH5eAJHVHERIVDpefLEpa0ktyd
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-03.ladok.umu.se:8445/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://ladok3-03.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se:8445/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://ladok3-03.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJALb4QvoyypFOMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA4WhcNMjIwNjI3MTIwODA4WjAhMR8wHQYDVQQDDBZsYWRvazMtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHxkmrGQNtgj0R5i17tm7OmmpKXk6Q2DZKTWcAQN3zZKbjqw0w9z7bNrtEJSPEmLKCfuIAFvoYTkik1LJ+VoQsCAwEAAaNQME4wHQYDVR0OBBYEFHGGau5hX0do3t9pCv2HMEESPS3iMB8GA1UdIwQYMBaAFHGGau5hX0do3t9pCv2HMEESPS3iMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDCPzJ64aeJ0eOoRW71p++Ij9qYw5KhDV7ITwTNzs0IhMIkMQvt9sJ83d22rYbH5eAJHVHERIVDpefLEpa0ktyd
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-03.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml
index 0eea0741..3d9d28b6 100644
--- a/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-04.ladok.umu.se/gui-sp">
-
<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://ladok3-04.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ AMLCoA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
index f122abb1..5585d686 100644
--- a/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-04.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-04.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJANPLS0K54P4ZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIwNjI3MTIwODA5WjAhMR8wHQYDVQQDDBZsYWRvazMtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANOhkVrIMMyWE8pChmHiDLxFaaThCHTUoXktWxcmjgDqJi+IFgmpF3YvY464fC01Cce2LkPFRmcPzlNGu45jsrkCAwEAAaNQME4wHQYDVR0OBBYEFJUxbkgsfPkTFfSGA5D/VVdRRC6IMB8GA1UdIwQYMBaAFJUxbkgsfPkTFfSGA5D/VVdRRC6IMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIV9Cl+cn1VGu93W/RTzlSJBpqZ5FeFOzGdmirFuZwph4NTJXOR+4Jwwptm92IaCyoxIfLbSjtT4gAdN4IKdCs
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-04.ladok.umu.se:8445/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://ladok3-04.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:8445/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://ladok3-04.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJANPLS0K54P4ZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIwNjI3MTIwODA5WjAhMR8wHQYDVQQDDBZsYWRvazMtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANOhkVrIMMyWE8pChmHiDLxFaaThCHTUoXktWxcmjgDqJi+IFgmpF3YvY464fC01Cce2LkPFRmcPzlNGu45jsrkCAwEAAaNQME4wHQYDVR0OBBYEFJUxbkgsfPkTFfSGA5D/VVdRRC6IMB8GA1UdIwQYMBaAFJUxbkgsfPkTFfSGA5D/VVdRRC6IMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIV9Cl+cn1VGu93W/RTzlSJBpqZ5FeFOzGdmirFuZwph4NTJXOR+4Jwwptm92IaCyoxIfLbSjtT4gAdN4IKdCs
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-04.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml
index 0631b1bc..70c2fcfd 100644
--- a/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-05.ladok.umu.se/gui-sp">
-
<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://ladok3-05.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ Ij/QYw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml
index 4780830a..2ac734c1 100644
--- a/swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-05.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-05.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJALxYczdIErXoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEwWhcNMjIwNjI3MTIwODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8ml40V5JMkp/Jo/T3L068kjLxBS++8xG03AQ0Mhe9qc++OswQh/iHBfH36Yuq1bpBEdiXQI2huAabz0PpT7ncCAwEAAaNQME4wHQYDVR0OBBYEFKmyGb8M4HcTZS33f7dYvafhQkwHMB8GA1UdIwQYMBaAFKmyGb8M4HcTZS33f7dYvafhQkwHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBs9EFoKibKZ3ed+FXZyPtSVl+bMEXYbxMySikK7TgpbviZTiGDj+LMymUDOi3QfosfYhhMOEf35T+z2yzZR9pp
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-05.ladok.umu.se:8445/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://ladok3-05.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se:8445/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://ladok3-05.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJALxYczdIErXoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEwWhcNMjIwNjI3MTIwODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8ml40V5JMkp/Jo/T3L068kjLxBS++8xG03AQ0Mhe9qc++OswQh/iHBfH36Yuq1bpBEdiXQI2huAabz0PpT7ncCAwEAAaNQME4wHQYDVR0OBBYEFKmyGb8M4HcTZS33f7dYvafhQkwHMB8GA1UdIwQYMBaAFKmyGb8M4HcTZS33f7dYvafhQkwHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBs9EFoKibKZ3ed+FXZyPtSVl+bMEXYbxMySikK7TgpbviZTiGDj+LMymUDOi3QfosfYhhMOEf35T+z2yzZR9pp
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-05.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml
index 09969c42..67c94c4e 100644
--- a/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-06.ladok.umu.se/gui-sp">
-
<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://ladok3-06.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ z181Cw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml
index 1dadfce5..a54955e1 100644
--- a/swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-06.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-06.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAMA6qKelJugCMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODExWhcNMjIwNjI3MTIwODExWjAhMR8wHQYDVQQDDBZsYWRvazMtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL4e3Vi7JBRnwHsWM9Zyh0MxzuBFd9WdXpyKWq8mHF2e9nRb4LG7yQdNCyTIyB6PsgKEuxfzNIbIQjt1549+a68CAwEAAaNQME4wHQYDVR0OBBYEFPk26/kCLHAp5poP06UubsNnOob+MB8GA1UdIwQYMBaAFPk26/kCLHAp5poP06UubsNnOob+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBbvJcLlI/W4ZZ1qoORJPS1GWgrRaFQ/y/S9yfhmIEc6q+PbeozbaaWu5AC7gPxFQIdgbcRbs4OonV614xpXzp4
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-06.ladok.umu.se:8445/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://ladok3-06.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se:8445/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://ladok3-06.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAMA6qKelJugCMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODExWhcNMjIwNjI3MTIwODExWjAhMR8wHQYDVQQDDBZsYWRvazMtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL4e3Vi7JBRnwHsWM9Zyh0MxzuBFd9WdXpyKWq8mHF2e9nRb4LG7yQdNCyTIyB6PsgKEuxfzNIbIQjt1549+a68CAwEAAaNQME4wHQYDVR0OBBYEFPk26/kCLHAp5poP06UubsNnOob+MB8GA1UdIwQYMBaAFPk26/kCLHAp5poP06UubsNnOob+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBbvJcLlI/W4ZZ1qoORJPS1GWgrRaFQ/y/S9yfhmIEc6q+PbeozbaaWu5AC7gPxFQIdgbcRbs4OonV614xpXzp4
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-06.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml
index 6194b296..491d4462 100644
--- a/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-07.ladok.umu.se/gui-sp">
-
<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://ladok3-07.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ LB5BtA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml
index 5b60f5a9..0d955ab1 100644
--- a/swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-07.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-07.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAMJtHFHhwUi6MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEyWhcNMjIwNjI3MTIwODEyWjAhMR8wHQYDVQQDDBZsYWRvazMtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN3ABXOZsCMwe16j4m9ijKy0KSbPVo7nQPrzslgJMb3hFKfv8mRwkwaPa1zVABBiiTSNt3GBj0anuPWfa/9kgFUCAwEAAaNQME4wHQYDVR0OBBYEFCPpRXGsYb8CyhNJW0SNz80h5kZ2MB8GA1UdIwQYMBaAFCPpRXGsYb8CyhNJW0SNz80h5kZ2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQAZVBFvOI8BDPunj+PH/12CkUC+oUA28SAA4Vaf16OY0Ur9ZId3YnjHvWNnBwAQavwum/nmBGC21N6DeAmvtpca
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-07.ladok.umu.se:8445/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://ladok3-07.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se:8445/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://ladok3-07.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAMJtHFHhwUi6MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEyWhcNMjIwNjI3MTIwODEyWjAhMR8wHQYDVQQDDBZsYWRvazMtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN3ABXOZsCMwe16j4m9ijKy0KSbPVo7nQPrzslgJMb3hFKfv8mRwkwaPa1zVABBiiTSNt3GBj0anuPWfa/9kgFUCAwEAAaNQME4wHQYDVR0OBBYEFCPpRXGsYb8CyhNJW0SNz80h5kZ2MB8GA1UdIwQYMBaAFCPpRXGsYb8CyhNJW0SNz80h5kZ2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQAZVBFvOI8BDPunj+PH/12CkUC+oUA28SAA4Vaf16OY0Ur9ZId3YnjHvWNnBwAQavwum/nmBGC21N6DeAmvtpca
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-07.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml
index 5a4464a8..44a0d735 100644
--- a/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-08.ladok.umu.se/gui-sp">
-
<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://ladok3-08.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ MTpiVw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml
index d3797b87..0287d0e5 100644
--- a/swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-08.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-08.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAM0ZgHR87qcZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEzWhcNMjIwNjI3MTIwODEzWjAhMR8wHQYDVQQDDBZsYWRvazMtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANNv2n6DiU48TQYg2ns2z6Zwuofx2M2m8rUPWDAk0+S+YpxcAchOkZk3cQXFr8j97cWPh/jjQ3UWoDVNh62abusCAwEAAaNQME4wHQYDVR0OBBYEFEwsAADE8MvLRJe2JXIkjfmfa4ttMB8GA1UdIwQYMBaAFEwsAADE8MvLRJe2JXIkjfmfa4ttMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDG/JErbZ8jKMR0h1GvwPvUlrpairm66ftVDJL36XGf4v52kHLy3dXsNoXU6jhotQOj9/Vj00tShDZ6W8Hyuzi5
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-08.ladok.umu.se:8445/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://ladok3-08.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se:8445/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://ladok3-08.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAM0ZgHR87qcZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEzWhcNMjIwNjI3MTIwODEzWjAhMR8wHQYDVQQDDBZsYWRvazMtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANNv2n6DiU48TQYg2ns2z6Zwuofx2M2m8rUPWDAk0+S+YpxcAchOkZk3cQXFr8j97cWPh/jjQ3UWoDVNh62abusCAwEAAaNQME4wHQYDVR0OBBYEFEwsAADE8MvLRJe2JXIkjfmfa4ttMB8GA1UdIwQYMBaAFEwsAADE8MvLRJe2JXIkjfmfa4ttMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDG/JErbZ8jKMR0h1GvwPvUlrpairm66ftVDJL36XGf4v52kHLy3dXsNoXU6jhotQOj9/Vj00tShDZ6W8Hyuzi5
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-08.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml
index 9118cf7d..f16433db 100644
--- a/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-09.ladok.umu.se/gui-sp">
-
<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://ladok3-09.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ QwOzJA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml
index a7860849..ea0d2b0a 100644
--- a/swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-09.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-09.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAJAu7iyC9KhwMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODE0WhcNMjIwNjI3MTIwODE0WjAhMR8wHQYDVQQDDBZsYWRvazMtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMi4pIBl5B4ECEVUHIHDgcDAjWgyhZusmsOpOLg/GyykZgdo6+mvdEWUuUAJxxQH/3Ntm2I01JmUlsXrfRPnq/cCAwEAAaNQME4wHQYDVR0OBBYEFMFzY+T3w6f8BAHWflV3UCg2y4lUMB8GA1UdIwQYMBaAFMFzY+T3w6f8BAHWflV3UCg2y4lUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCwDlygOl0Z/MGmPu9jd++Nmc0i4+C29trVPL8d6Ctv/fVxPwylNq/+bN7ZFru/zj6OP7erlpqCDvmQWmrn8EY4
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-09.ladok.umu.se:8445/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://ladok3-09.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se:8445/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://ladok3-09.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAJAu7iyC9KhwMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODE0WhcNMjIwNjI3MTIwODE0WjAhMR8wHQYDVQQDDBZsYWRvazMtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMi4pIBl5B4ECEVUHIHDgcDAjWgyhZusmsOpOLg/GyykZgdo6+mvdEWUuUAJxxQH/3Ntm2I01JmUlsXrfRPnq/cCAwEAAaNQME4wHQYDVR0OBBYEFMFzY+T3w6f8BAHWflV3UCg2y4lUMB8GA1UdIwQYMBaAFMFzY+T3w6f8BAHWflV3UCg2y4lUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCwDlygOl0Z/MGmPu9jd++Nmc0i4+C29trVPL8d6Ctv/fVxPwylNq/+bN7ZFru/zj6OP7erlpqCDvmQWmrn8EY4
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-09.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml
index b20851b7..c03ab186 100644
--- a/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-10.ladok.umu.se/gui-sp">
-
<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://ladok3-10.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ zL2y+w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml
index 6c34326a..0f17b6c7 100644
--- a/swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-10.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-10.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAO7SIfqIQN96MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0xMC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwNjAxWhcNMjIwNjI3MTIwNjAxWjAhMR8wHQYDVQQDDBZsYWRvazMtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM4PKoyelZhhFaeKik8/87oxP2SPLwd68XxlV5VLV+klY5UB+i8zFyJlxkBSEn0tYDNvoILbrsdXwU6Q23EcNcCAwEAAaNQME4wHQYDVR0OBBYEFGViq4GYvl4YheQToC8foifV/eLZMB8GA1UdIwQYMBaAFGViq4GYvl4YheQToC8foifV/eLZMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQB4H3zJUmLN56YN4rJfhh8AwnvyezF2QXlcOu8i+DpVQv/p2W6VGWqdxYl3KxTBZsELL6TyaOSSwvTGQOkLj4u/
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-10.ladok.umu.se:8445/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://ladok3-10.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se:8445/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://ladok3-10.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBizCCATWgAwIBAgIJAO7SIfqIQN96MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0xMC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwNjAxWhcNMjIwNjI3MTIwNjAxWjAhMR8wHQYDVQQDDBZsYWRvazMtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM4PKoyelZhhFaeKik8/87oxP2SPLwd68XxlV5VLV+klY5UB+i8zFyJlxkBSEn0tYDNvoILbrsdXwU6Q23EcNcCAwEAAaNQME4wHQYDVR0OBBYEFGViq4GYvl4YheQToC8foifV/eLZMB8GA1UdIwQYMBaAFGViq4GYvl4YheQToC8foifV/eLZMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQB4H3zJUmLN56YN4rJfhh8AwnvyezF2QXlcOu8i+DpVQv/p2W6VGWqdxYl3KxTBZsELL6TyaOSSwvTGQOkLj4u/
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-10.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
index 72d5142b..4e9a457e 100644
--- a/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p00.ladok.umu.se/gui-sp">
-
<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://ladok3-p00.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ vt1mkOs1sbw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml
index cfbbf18e..e18d0e38 100644
--- a/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-p00.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-p00.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBjTCCATegAwIBAgIJANXpKwXKmM24MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMMF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOVoXDTIyMDkyOTExMzIyOVowIjEgMB4GA1UEAwwXbGFkb2szLXAwMC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAowQxKkq7Lom51gN/EVw3s9O+uINyhh4jGtGz3enyFbwvHrGqWPuL7wtRjCN6tc/bYk2oLGRJgDE9nRCZKema/QIDAQABo1AwTjAdBgNVHQ4EFgQUw52OrLNysL3wdCMbtuKG18Yd+PIwHwYDVR0jBBgwFoAUw52OrLNysL3wdCMbtuKG18Yd+PIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGkUTal4Z+7/W36AJbqqoVACclN8exDtfpqAJIClRl22WtB1bkQkxBRD38yrcHop3/F39KPSFlfttDQYbeqxRzs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-p00.ladok.umu.se:8445/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://ladok3-p00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se:8445/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://ladok3-p00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBjTCCATegAwIBAgIJANXpKwXKmM24MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMMF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOVoXDTIyMDkyOTExMzIyOVowIjEgMB4GA1UEAwwXbGFkb2szLXAwMC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAowQxKkq7Lom51gN/EVw3s9O+uINyhh4jGtGz3enyFbwvHrGqWPuL7wtRjCN6tc/bYk2oLGRJgDE9nRCZKema/QIDAQABo1AwTjAdBgNVHQ4EFgQUw52OrLNysL3wdCMbtuKG18Yd+PIwHwYDVR0jBBgwFoAUw52OrLNysL3wdCMbtuKG18Yd+PIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGkUTal4Z+7/W36AJbqqoVACclN8exDtfpqAJIClRl22WtB1bkQkxBRD38yrcHop3/F39KPSFlfttDQYbeqxRzs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3-p00.ladok.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-1.0/ladok3test.its.umu.se-gui-sp.xml
index 76560e13..939b8f3d 100644
--- a/swamid-1.0/ladok3test.its.umu.se-gui-sp.xml
+++ b/swamid-1.0/ladok3test.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3test.its.umu.se/gui-sp">
-
<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://ladok3test.its.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ UEv/iCMoAJgGFRraTZFMDldSSu+MjBUuCi4kZaUImeVa0yXr7qBwZmYvdqgddDKO
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3test.its.umu.se-user-idp.xml b/swamid-1.0/ladok3test.its.umu.se-user-idp.xml
index 0f3f2f7e..5dcdd01c 100644
--- a/swamid-1.0/ladok3test.its.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3test.its.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3test.its.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3test.its.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTAeFw0xMjA4MjkwOTAxNDNaFw0yMjA4MjcwOTAxNDNaMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFPtcei8TeZXig5GCDrsCdIQQmyA6wBU/PGp3PYrQ+D88y6BS5pWL5T/yNVjQNVQL7s/gDuAPx7EEPc7hEQbjlAgMBAAGjUDBOMB0GA1UdDgQWBBRBXDH06EuK38we1rGgnsdCV+26UDAfBgNVHSMEGDAWgBRBXDH06EuK38we1rGgnsdCV+26UDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAiVI4ufIl15vCIbIRdV4lK8s0VjrgPCbcknAPPFZGRtWB83ptfgyuyZuQ6NbGPRCkJA9nxPbX5FlMKbokBG9zgg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3test.its.umu.se:8445/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://ladok3test.its.umu.se:8444/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se:8445/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://ladok3test.its.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3test.its.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTAeFw0xMjA4MjkwOTAxNDNaFw0yMjA4MjcwOTAxNDNaMCAxHjAcBgNVBAMMFWxhZG9rM3Rlc3QuaXRzLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFPtcei8TeZXig5GCDrsCdIQQmyA6wBU/PGp3PYrQ+D88y6BS5pWL5T/yNVjQNVQL7s/gDuAPx7EEPc7hEQbjlAgMBAAGjUDBOMB0GA1UdDgQWBBRBXDH06EuK38we1rGgnsdCV+26UDAfBgNVHSMEGDAWgBRBXDH06EuK38we1rGgnsdCV+26UDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAiVI4ufIl15vCIbIRdV4lK8s0VjrgPCbcknAPPFZGRtWB83ptfgyuyZuQ6NbGPRCkJA9nxPbX5FlMKbokBG9zgg==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ladok3test.its.umu.se:8445/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3test.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se:8445/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/lingon.ladok.umu.se.xml b/swamid-1.0/lingon.ladok.umu.se.xml
index 023e9b41..f0609c2e 100644
--- a/swamid-1.0/lingon.ladok.umu.se.xml
+++ b/swamid-1.0/lingon.ladok.umu.se.xml
@@ -1,20 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
- xmlns:ns2="http://www.w3.org/2000/09/xmldsig#"
- entityID="https://lingon.ladok.umu.se:8087/sp.xml">
- <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <ns0:Extensions>
- <ns1:DiscoveryResponse
- Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
- Location="https://lingon.ladok.umu.se:8087/disco"
- index="1"/>
- </ns0:Extensions>
- <ns0:KeyDescriptor use="encryption">
- <ns2:KeyInfo>
- <ns2:X509Data>
- <ns2:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://lingon.ladok.umu.se:8087/sp.xml">
+ <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <ns0:Extensions>
+ <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lingon.ladok.umu.se:8087/disco" index="1"/>
+ </ns0:Extensions>
+ <ns0:KeyDescriptor use="encryption">
+ <ns2:KeyInfo>
+ <ns2:X509Data>
+ <ns2:X509Certificate>
MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
@@ -32,13 +25,13 @@
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
</ns2:X509Certificate>
- </ns2:X509Data>
- </ns2:KeyInfo>
- </ns0:KeyDescriptor>
- <ns0:KeyDescriptor use="signing">
- <ns2:KeyInfo>
- <ns2:X509Data>
- <ns2:X509Certificate>
+ </ns2:X509Data>
+ </ns2:KeyInfo>
+ </ns0:KeyDescriptor>
+ <ns0:KeyDescriptor use="signing">
+ <ns2:KeyInfo>
+ <ns2:X509Data>
+ <ns2:X509Certificate>
MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
@@ -56,52 +49,30 @@
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
</ns2:X509Certificate>
- </ns2:X509Data>
- </ns2:KeyInfo>
- </ns0:KeyDescriptor>
- <ns0:ArtifactResolutionService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://lingon.ladok.umu.se:8087/ars" index="1"/>
- <ns0:SingleLogoutService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://lingon.ladok.umu.se:8087/sls"/>
- <ns0:ManageNameIDService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://lingon.ladok.umu.se:8087/mni"/>
- <ns0:ManageNameIDService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://lingon.ladok.umu.se:8087/mni"/>
- <ns0:ManageNameIDService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://lingon.ladok.umu.se:8087/mni"/>
- <ns0:ManageNameIDService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
- Location="https://lingon.ladok.umu.se:8087/acs/artifact"/>
- <ns0:AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://lingon.ladok.umu.se:8087/acs/post" index="1"/>
- <ns0:AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://lingon.ladok.umu.se:8087/acs/redirect"
- index="2"/>
- <ns0:AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
- Location="https://lingon.ladok.umu.se:8087/acs/artifact"
- index="3"/>
- <ns0:AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
- Location="https://lingon.ladok.umu.se:8087/ecp" index="4"/>
- </ns0:SPSSODescriptor>
- <ns0:Organization>
- <ns0:OrganizationName xml:lang="se">Ume Universitet</ns0:OrganizationName>
- <ns0:OrganizationDisplayName xml:lang="se">Ume Universitet
+ </ns2:X509Data>
+ </ns2:KeyInfo>
+ </ns0:KeyDescriptor>
+ <ns0:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/ars" index="1"/>
+ <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/sls"/>
+ <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lingon.ladok.umu.se:8087/mni"/>
+ <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lingon.ladok.umu.se:8087/mni"/>
+ <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/mni"/>
+ <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lingon.ladok.umu.se:8087/acs/artifact"/>
+ <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lingon.ladok.umu.se:8087/acs/post" index="1"/>
+ <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lingon.ladok.umu.se:8087/acs/redirect" index="2"/>
+ <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lingon.ladok.umu.se:8087/acs/artifact" index="3"/>
+ <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lingon.ladok.umu.se:8087/ecp" index="4"/>
+ </ns0:SPSSODescriptor>
+ <ns0:Organization>
+ <ns0:OrganizationName xml:lang="se">Ume Universitet</ns0:OrganizationName>
+ <ns0:OrganizationDisplayName xml:lang="se">Ume Universitet
</ns0:OrganizationDisplayName>
- <ns0:OrganizationURL xml:lang="en">http://www.umu.se
+ <ns0:OrganizationURL xml:lang="en">http://www.umu.se
</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson contactType="technical">
- <ns0:GivenName>Roland</ns0:GivenName>
- <ns0:SurName>Hedberg</ns0:SurName>
- <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
- </ns0:ContactPerson>
+ </ns0:Organization>
+ <ns0:ContactPerson contactType="technical">
+ <ns0:GivenName>Roland</ns0:GivenName>
+ <ns0:SurName>Hedberg</ns0:SurName>
+ <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
+ </ns0:ContactPerson>
</ns0:EntityDescriptor>
diff --git a/swamid-1.0/lists.su.se.xml b/swamid-1.0/lists.su.se.xml
index f6d3fa6d..7ef17e8c 100644
--- a/swamid-1.0/lists.su.se.xml
+++ b/swamid-1.0/lists.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/livesrv.ex.vr.se.xml b/swamid-1.0/livesrv.ex.vr.se.xml
index 39f5f799..4c7cdd0c 100644
--- a/swamid-1.0/livesrv.ex.vr.se.xml
+++ b/swamid-1.0/livesrv.ex.vr.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://livesrv.ex.vr.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://livesrv.ex.vr.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
@@ -34,44 +28,26 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://livesrv.ex.vr.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://livesrv.ex.vr.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://livesrv.ex.vr.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
@@ -92,22 +68,15 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://livesrv.ex.vr.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://livesrv.ex.vr.se: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">VR</OrganizationName>
<OrganizationDisplayName xml:lang="en">Vetenskapsrådet</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
@@ -115,6 +84,5 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
<ContactPerson contactType="technical">
<Company>Swedish Reasearch Council</Company>
<EmailAddress>kontors-it@vr.se</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/login-dev.du.se.xml b/swamid-1.0/login-dev.du.se.xml
index 8bea687b..c71be766 100644
--- a/swamid-1.0/login-dev.du.se.xml
+++ b/swamid-1.0/login-dev.du.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://login-dev.du.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">du.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login-dev.du.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">du.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
@@ -33,44 +27,26 @@ C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://login-dev.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://login-dev.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://login-dev.du.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://login-dev.du.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://login-dev.du.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://login-dev.du.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">du.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-dev.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-dev.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-dev.du.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-dev.du.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-dev.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-dev.du.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">du.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
@@ -90,21 +66,15 @@ C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://login-dev.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://login-dev.du.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-dev.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-dev.du.se: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">du.se</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan Dalarna (Dev)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
@@ -113,6 +83,4 @@ xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
<Company>Högskolan Dalarna</Company>
<EmailAddress>dempa@du.se</EmailAddress>
</ContactPerson>
-
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/login.du.se.xml b/swamid-1.0/login.du.se.xml
index 1669fa72..309598c1 100644
--- a/swamid-1.0/login.du.se.xml
+++ b/swamid-1.0/login.du.se.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.du.se/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">du.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">H&#xF6;gskolan Dalarna</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider f&#xF6;r anst&#xE4;llda och studenter vid H&#xF6;gskolan Dalarna.</mdui:Description>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
<mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
<mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
@@ -90,11 +90,11 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">DU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">H&#xF6;gskolan Dalarna</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Högskolan Dalarna</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <Company>H&#xF6;gskolan Dalarna</Company>
+ <Company>Högskolan Dalarna</Company>
<EmailAddress>dempa@du.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/login.liu.se.xml b/swamid-1.0/login.liu.se.xml
index a9ddcbbb..ee4b1136 100644
--- a/swamid-1.0/login.liu.se.xml
+++ b/swamid-1.0/login.liu.se.xml
@@ -1,42 +1,33 @@
-<EntityDescriptor entityID="https://login.liu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.liu.se/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
- <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-
- <mdui:Logo xml:lang="sv" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
- <mdui:Logo xml:lang="sv" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
- <mdui:Logo xml:lang="sv" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
- <mdui:Logo xml:lang="sv" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-
- <mdui:Logo xml:lang="en" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
- <mdui:Logo xml:lang="en" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
- <mdui:Logo xml:lang="en" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
- <mdui:Logo xml:lang="en" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>liu.se</mdui:DomainHint>
- <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
- <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
- <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <Extensions>
+ <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
+ <mdui:Logo xml:lang="sv" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>liu.se</mdui:DomainHint>
+ <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
@@ -56,36 +47,26 @@ zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
@@ -105,19 +86,14 @@ zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se: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">LiU</OrganizationName>
<OrganizationName xml:lang="sv">LiU</OrganizationName>
@@ -141,5 +117,4 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
<SurName>LiU-IT SAML admins</SurName>
<EmailAddress>saml-admins@it.liu.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/login.proxy.kib.ki.se.xml b/swamid-1.0/login.proxy.kib.ki.se.xml
index 8abc0b05..25a15b18 100644
--- a/swamid-1.0/login.proxy.kib.ki.se.xml
+++ b/swamid-1.0/login.proxy.kib.ki.se.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.proxy.kib.ki.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
<md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext" index="1" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"/>
+ <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="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext" index="1"/>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/lpw.ki.se.xml b/swamid-1.0/lpw.ki.se.xml
index 77666220..cd5941fb 100644
--- a/swamid-1.0/lpw.ki.se.xml
+++ b/swamid-1.0/lpw.ki.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpw.ki.se/shibboleth">
-
<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://lpw.ki.se/Shibboleth.sso/Login"/>
@@ -42,5 +42,4 @@ D1QNfeY/pFOqpfSxgp64TIVe9v9UJ7QJRm7zh51LDEjqyJwd/xxNyA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpw.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpw.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/lpwdev.it.ki.se.xml b/swamid-1.0/lpwdev.it.ki.se.xml
index 21123f6e..64b412af 100644
--- a/swamid-1.0/lpwdev.it.ki.se.xml
+++ b/swamid-1.0/lpwdev.it.ki.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpwdev.it.ki.se/shibboleth">
-
<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="http://lpwdev.it.ki.se/Shibboleth.sso/Login"/>
@@ -44,5 +44,4 @@ T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/luigi.umdc.umu.se-aws-sp.xml b/swamid-1.0/luigi.umdc.umu.se-aws-sp.xml
index 3084d91c..7740a3ca 100644
--- a/swamid-1.0/luigi.umdc.umu.se-aws-sp.xml
+++ b/swamid-1.0/luigi.umdc.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.nyautb.its.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ YBqltfATQ9fVPJDBuibrJjTB9qV4oj5RvzpRo6tp1MQ=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml b/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml
index 115d28cc..0c79ab39 100644
--- a/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml
+++ b/swamid-1.0/luigi.umdc.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://dwidp.nyautb.its.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.nyautb.its.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.nyautb.its.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml b/swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml
index 35d3f1f8..7d936fd8 100644
--- a/swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml
+++ b/swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.nyautb.its.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ blmiwLs0G0IFUYT60lInJiH7a2ooqJ0rc6Ysk33BnWCVRC7IJr8kYA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml b/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml
index a5ae71a4..4ac3ca3b 100644
--- a/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://shibboleth.nyautb.its.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.nyautb.its.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.nyautb.its.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/mail.su.se.xml b/swamid-1.0/mail.su.se.xml
index 834869aa..a866c60b 100644
--- a/swamid-1.0/mail.su.se.xml
+++ b/swamid-1.0/mail.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mail.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mail.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ pCVWIw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mail.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/mailfilter-test.nordu.net.xml b/swamid-1.0/mailfilter-test.nordu.net.xml
index 429dee01..881c7d22 100644
--- a/swamid-1.0/mailfilter-test.nordu.net.xml
+++ b/swamid-1.0/mailfilter-test.nordu.net.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mailfilter-test.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -73,5 +72,4 @@ VXfcZO7EtnsxYb035Zcei+quLWwJFAIKXwMSWZQEVo4WXa83B8oKnw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mailfilter.nordu.net.xml b/swamid-1.0/mailfilter.nordu.net.xml
index c05b76da..b4a7590c 100644
--- a/swamid-1.0/mailfilter.nordu.net.xml
+++ b/swamid-1.0/mailfilter.nordu.net.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mailfilter.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -73,12 +73,11 @@ KHCx/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SUNET Mailfilter Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SUNET Mailfilter Service</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:ServiceName xml:lang="en">SUNET Mailfilter Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET Mailfilter Service</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mailfilter.sunet.se.xml b/swamid-1.0/mailfilter.sunet.se.xml
index 258fc5ab..fabd3a54 100644
--- a/swamid-1.0/mailfilter.sunet.se.xml
+++ b/swamid-1.0/mailfilter.sunet.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mailfilter.sunet.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -80,12 +80,11 @@ KHCx/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SUNET Mailfilter Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SUNET Mailfilter Service</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:ServiceName xml:lang="en">SUNET Mailfilter Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET Mailfilter Service</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mds-test.sunet.se.xml b/swamid-1.0/mds-test.sunet.se.xml
index 05dfd062..24d9b2e0 100644
--- a/swamid-1.0/mds-test.sunet.se.xml
+++ b/swamid-1.0/mds-test.sunet.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mds-test.sunet.se/shibboleth">
-
<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://mds-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -48,5 +47,4 @@ VtHMCV6pEmWvRxvRGMxUfw8=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mds.lan.kth.se.xml b/swamid-1.0/mds.lan.kth.se.xml
index 5a402f51..9fc434af 100644
--- a/swamid-1.0/mds.lan.kth.se.xml
+++ b/swamid-1.0/mds.lan.kth.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mds.lan.kth.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds.lan.kth.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -73,5 +72,4 @@ K4y2OQU=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mds.sunet.se.xml b/swamid-1.0/mds.sunet.se.xml
index d631f251..36d51012 100644
--- a/swamid-1.0/mds.sunet.se.xml
+++ b/swamid-1.0/mds.sunet.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mds.sunet.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -71,5 +70,4 @@ dnjCadQzQamnqs4mfuypLT2wWWjkat9QKAM9gHkMwcC1Uv2RM2QeR8FDySJX
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mds2.nordu.net.xml b/swamid-1.0/mds2.nordu.net.xml
index ee03e9f1..71f987ce 100644
--- a/swamid-1.0/mds2.nordu.net.xml
+++ b/swamid-1.0/mds2.nordu.net.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mds2.nordu.net/shibboleth">
-
<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://mds2.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -48,5 +47,4 @@ JQ7XzWg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds2.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds2.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/medieportaltest.kau.se.xml b/swamid-1.0/medieportaltest.kau.se.xml
index a345f0e7..fee019fe 100644
--- a/swamid-1.0/medieportaltest.kau.se.xml
+++ b/swamid-1.0/medieportaltest.kau.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://medieportaltest.kau.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://medieportaltest.kau.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -75,5 +74,4 @@ GUwA19+wdyIxPgPJxJjsz6+zXMVTPRLexVBhGepW+c9w69YV3Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/meetingtools.nordu.net.xml b/swamid-1.0/meetingtools.nordu.net.xml
index 875fc42f..3768a113 100644
--- a/swamid-1.0/meetingtools.nordu.net.xml
+++ b/swamid-1.0/meetingtools.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meetingtools.nordu.net/shibboleth">
<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>
@@ -71,13 +72,13 @@ pcqH0yzoEFA0VHDdXA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">NORDUnet E-Meeting Tools</md:ServiceName>
- <md:ServiceDescription xml:lang="en">NORDUnet E-Meeting Tools</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:ServiceName xml:lang="en">NORDUnet E-Meeting Tools</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">NORDUnet E-Meeting Tools</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-1.0/meta.eduroam.se.xml b/swamid-1.0/meta.eduroam.se.xml
index b3ea867b..400ea5a7 100644
--- a/swamid-1.0/meta.eduroam.se.xml
+++ b/swamid-1.0/meta.eduroam.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.eduroam.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.eduroam.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -73,5 +72,4 @@ VHwj8+XpYqMH
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meta.eduroam.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meta.eduroam.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/minastudier-test.su.se.xml b/swamid-1.0/minastudier-test.su.se.xml
index c61bcc0c..c05a7ad6 100644
--- a/swamid-1.0/minastudier-test.su.se.xml
+++ b/swamid-1.0/minastudier-test.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minastudier-test.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier-test.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -75,5 +74,4 @@ Og==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/minastudier.ladok.umu.se-user-idp.xml b/swamid-1.0/minastudier.ladok.umu.se-user-idp.xml
index 73fd3bcc..b5c30e85 100644
--- a/swamid-1.0/minastudier.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/minastudier.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://minastudier.ladok.umu.se/user-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">minastudier.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://minastudier.ladok.umu.se/user-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">minastudier.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJAOgfe3lcHWPLMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTAeFw0xMjA4MDIxMjA0MTVaFw0yMjA3MzExMjA0MTVaMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGOjGCL1qrKrmLW7yeUilJSjI9SpDoqMkN6I6iMkCePamRzWuVZrNcI80Llh6Oh9dZ8KDexoYC0eMhBSN0vj0xAgMBAAGjgYUwgYIwHQYDVR0OBBYEFCBs1ni/aMI3mmsoV9WUPaHgNPn2MFMGA1UdIwRMMEqAFCBs1ni/aMI3mmsoV9WUPaHgNPn2oSekJTAjMSEwHwYDVQQDExhtaW5hc3R1ZGllci5sYWRvay51bXUuc2WCCQDoH3t5XB1jyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAxWYtrMwDnEwv1jtWk0tUpXwS0jvmnWHZEc9bvucA8OALEo5LCuIkC5aKgQLP4WPMVlrb035x3j+kM1utp0hPqw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://minastudier.ladok.umu.se:8443/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">minastudier.ladok.umu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://minastudier.ladok.umu.se:8443/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">minastudier.ladok.umu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBxTCCAW+gAwIBAgIJAOgfe3lcHWPLMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTAeFw0xMjA4MDIxMjA0MTVaFw0yMjA3MzExMjA0MTVaMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGOjGCL1qrKrmLW7yeUilJSjI9SpDoqMkN6I6iMkCePamRzWuVZrNcI80Llh6Oh9dZ8KDexoYC0eMhBSN0vj0xAgMBAAGjgYUwgYIwHQYDVR0OBBYEFCBs1ni/aMI3mmsoV9WUPaHgNPn2MFMGA1UdIwRMMEqAFCBs1ni/aMI3mmsoV9WUPaHgNPn2oSekJTAjMSEwHwYDVQQDExhtaW5hc3R1ZGllci5sYWRvay51bXUuc2WCCQDoH3t5XB1jyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAxWYtrMwDnEwv1jtWk0tUpXwS0jvmnWHZEc9bvucA8OALEo5LCuIkC5aKgQLP4WPMVlrb035x3j+kM1utp0hPqw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML2/SOAP/AttributeQuery" />
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- </AttributeAuthorityDescriptor>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/minastudier.ladok.umu.se.xml b/swamid-1.0/minastudier.ladok.umu.se.xml
index 10bb6dfa..1d679ace 100644
--- a/swamid-1.0/minastudier.ladok.umu.se.xml
+++ b/swamid-1.0/minastudier.ladok.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minasidor.ladok.umu.se/shib-sp">
-
<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://minastudier.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -46,5 +45,4 @@ BSjBWAdDFrXgrc1jPw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/minastudier.su.se.xml b/swamid-1.0/minastudier.su.se.xml
index 7701de00..f51430bf 100644
--- a/swamid-1.0/minastudier.su.se.xml
+++ b/swamid-1.0/minastudier.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minastudier.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -75,5 +74,4 @@ pA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/mondo-test.su.se.xml b/swamid-1.0/mondo-test.su.se.xml
index b219d41e..70788502 100644
--- a/swamid-1.0/mondo-test.su.se.xml
+++ b/swamid-1.0/mondo-test.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo-test.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ gPEuvyJcqNew1GkpXzoPXU8ty7cuJ7ZgB100cnoXttIkiq13tlTaRw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/mondo-web.it.su.se.xml b/swamid-1.0/mondo-web.it.su.se.xml
index 48887aef..e6b83993 100644
--- a/swamid-1.0/mondo-web.it.su.se.xml
+++ b/swamid-1.0/mondo-web.it.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo-web.it.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/mondo.su.se.xml b/swamid-1.0/mondo.su.se.xml
index 3fa5442a..0e1c777c 100644
--- a/swamid-1.0/mondo.su.se.xml
+++ b/swamid-1.0/mondo.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mondo.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ z/E5dFvlHgjgE2ON6BQ/LtWQP5FMV/ZXjsRSINnc12T9AQV6Q4P51Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/monitor.it.su.se.xml b/swamid-1.0/monitor.it.su.se.xml
index 65344891..ebaa10b0 100644
--- a/swamid-1.0/monitor.it.su.se.xml
+++ b/swamid-1.0/monitor.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://monitor.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ M1QL2iqLjZ5itEAcf2eT0T4jr1zPcprELLxcai13KiAIwOndIBfzhApcFw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://monitor.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/moodle.lhs.se.xml b/swamid-1.0/moodle.lhs.se.xml
index 1858c334..e920ab9d 100644
--- a/swamid-1.0/moodle.lhs.se.xml
+++ b/swamid-1.0/moodle.lhs.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodle.lhs.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/nacho.adm.gu.se.xml b/swamid-1.0/nacho.adm.gu.se.xml
index 923dad65..62f3f0ce 100644
--- a/swamid-1.0/nacho.adm.gu.se.xml
+++ b/swamid-1.0/nacho.adm.gu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nacho.adm.gu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nacho.adm.gu.se/Shibboleth.sso/DS" index="1"/>
@@ -71,5 +70,4 @@ s0eg2zS0HU2kmUbaL6tbYB5jyw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nagios-vm.nordu.net.xml b/swamid-1.0/nagios-vm.nordu.net.xml
index 334876ab..0a4b9add 100644
--- a/swamid-1.0/nagios-vm.nordu.net.xml
+++ b/swamid-1.0/nagios-vm.nordu.net.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nagios-vm.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios-vm.nordu.net/Shibboleth.sso/DS" index="1"/>
@@ -73,5 +72,4 @@ iTg/j/tOBYfIuWhX2ipi+fFwWaqmIk1LxA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nagios.dev.it.su.se.xml b/swamid-1.0/nagios.dev.it.su.se.xml
index 66b1096b..57cf2f16 100644
--- a/swamid-1.0/nagios.dev.it.su.se.xml
+++ b/swamid-1.0/nagios.dev.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nagios.dev.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.dev.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ pu1WxSK20jmHhXLayahQbkim4P4KSiux7dwX1VFoG0zaBhPRFLxiCni+Jyuc8T3n
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nagios.nordu.net.xml b/swamid-1.0/nagios.nordu.net.xml
index 9099a00c..e7240428 100644
--- a/swamid-1.0/nagios.nordu.net.xml
+++ b/swamid-1.0/nagios.nordu.net.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nagios.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.nordu.net/Shibboleth.sso/DS" index="1"/>
@@ -70,5 +70,4 @@ J2FYmoN42tc/5eQBmQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml
index c3e2c48f..8dfdff67 100644
--- a/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/aws-sp-en">
-
<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://nb11.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Zhi08S0wFSiLmVBI8dLk97mWOYwJgDwmEpkeR/ng+YkH3WE=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-aws-sp.xml b/swamid-1.0/nb11.ladok.umu.se-aws-sp.xml
index b0d34f0b..f1a87976 100644
--- a/swamid-1.0/nb11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml b/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
index 1d63f489..ff53b752 100644
--- a/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml
index 615e2f41..acbb6de2 100644
--- a/swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
index 12275f91..ba980e1c 100644
--- a/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nb11_idp-metadata.xml b/swamid-1.0/nb11_idp-metadata.xml
index ca7402b9..88c2f137 100644
--- a/swamid-1.0/nb11_idp-metadata.xml
+++ b/swamid-1.0/nb11_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nb11.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAOfLKjqkxYWrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA5Z8A1xR3akCeI+NjODnzoqiFHUFG8pDdw3+aO7MNa/yeRzM8uHl6aCkP6miYYH7r+soXW8tAxTaQqQjr48r00QIDAQABo30wezAdBgNVHQ4EFgQU83V36xws26bu0AS5R2SWaVx7C+IwTAYDVR0jBEUwQ4AU83V36xws26bu0AS5R2SWaVx7C+KhIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA58sqOqTFhaswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEs78Z/5GpwPeBYt0BiwkEu87yT1075ZwaEq+Z6ROI9CCVSmd7Y8P8WOMqgkQRx7ROg2vCyeNOLhhnUtEeFP6QI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb11.ladok.umu.se:8452/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://nb11.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8452/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://nb11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAOfLKjqkxYWrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA5Z8A1xR3akCeI+NjODnzoqiFHUFG8pDdw3+aO7MNa/yeRzM8uHl6aCkP6miYYH7r+soXW8tAxTaQqQjr48r00QIDAQABo30wezAdBgNVHQ4EFgQU83V36xws26bu0AS5R2SWaVx7C+IwTAYDVR0jBEUwQ4AU83V36xws26bu0AS5R2SWaVx7C+KhIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA58sqOqTFhaswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEs78Z/5GpwPeBYt0BiwkEu87yT1075ZwaEq+Z6ROI9CCVSmd7Y8P8WOMqgkQRx7ROg2vCyeNOLhhnUtEeFP6QI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb11.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/ni.nordu.net-pysaml2.xml b/swamid-1.0/ni.nordu.net-pysaml2.xml
index 4a1de315..eef0e705 100644
--- a/swamid-1.0/ni.nordu.net-pysaml2.xml
+++ b/swamid-1.0/ni.nordu.net-pysaml2.xml
@@ -1,15 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<md:EntityDescriptor entityID="https://ni.nordu.net/saml2/metadata/" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ni.nordu.net/saml2/metadata/">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-<md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAI32hx6m/IFWMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+ <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAI32hx6m/IFWMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMjA4MzAxMjAyMTFaFw0yMjA4MjgxMjAyMTFa
MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
ADCCAQoCggEBAKIsfzWwYgW2y9+K58VQi35/weisNzGlYYJbpYY8+AqGhtkSpB8D
@@ -25,4 +27,22 @@ WjzMRZMjN4LkL+s6m0f4ASItLF5MBXmStmxl5ZE0UajyR08i87sg9QcTVXBpyirr
iRfdxDA4R+g0xwEZhpg2HbKRHeP8Uy/8SrOLYMFsblex5vc/96eZCOc88FlH1ydk
zj16pWsjoYc1j+cnJBREpOJCeotrkBKte+OL1J5ku6e3qoQ+4Oyrsu4qhU/8geIo
GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==
-</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.nordu.net/saml2/ls/" /><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/saml2/acs/" index="1" /><md:AttributeConsumingService index="1"><md:ServiceName xml:lang="en">NOCLook</md:ServiceName><md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /></md:AttributeConsumingService></md:SPSSODescriptor><md:ContactPerson contactType="technical"><md:Company>NORDUnet A/S</md:Company><md:GivenName>Johan</md:GivenName><md:SurName>Lundberg</md:SurName><md:EmailAddress>lundberg@nordu.net</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.nordu.net/saml2/ls/"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/saml2/acs/" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">NOCLook</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:Company>NORDUnet A/S</md:Company>
+ <md:GivenName>Johan</md:GivenName>
+ <md:SurName>Lundberg</md:SurName>
+ <md:EmailAddress>lundberg@nordu.net</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-1.0/ni.nordu.net.xml b/swamid-1.0/ni.nordu.net.xml
index 2370d424..e38b995b 100644
--- a/swamid-1.0/ni.nordu.net.xml
+++ b/swamid-1.0/ni.nordu.net.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ni.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -73,5 +72,4 @@ gr3luWR80XE/BadEH5ou361kFDqBeuskbdr357QtCw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ni.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ni.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nordunet.tv.xml b/swamid-1.0/nordunet.tv.xml
index 8eaf4a31..017c3e13 100644
--- a/swamid-1.0/nordunet.tv.xml
+++ b/swamid-1.0/nordunet.tv.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nordunet.tv/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nordunet.tv/Shibboleth.sso/Login" index="1"/>
@@ -71,13 +70,13 @@ UuGq63xCD7WDlXE0wpoWBE2dJUti1P4OovwFCUN4aqYT1c2y4wneVj/KTEWy8qKz
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nordunet.tv/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nordunet.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">NORDUnet TV</md:ServiceName>
- <md:ServiceDescription xml:lang="en">NORDUnet Media Distribution Site</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:ServiceName xml:lang="en">NORDUnet TV</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">NORDUnet Media Distribution Site</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-1.0/nordushare-dev.nordu.net.xml b/swamid-1.0/nordushare-dev.nordu.net.xml
index 858ec1dc..ff509cd2 100644
--- a/swamid-1.0/nordushare-dev.nordu.net.xml
+++ b/swamid-1.0/nordushare-dev.nordu.net.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nordushare-dev.nordu.net/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -69,5 +68,4 @@ KaYlHoIdpaOJncFcM6QJQyZPJQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml
index 196ff079..f4a7d1ae 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/aws-sp-en">
-
<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://nya-00.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ IsSttJd80aXG47UxpShXBikaeFzYzUicYDwlWko91gh5zVUtL8VrVBVu0w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml
index 70f2eff7..fc5dc478 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ EQCi6eLTHNmRPDAUY7W6LPbhNtXs1ieRJ8tKFug4pEjGAq7FDPCIQA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
index 5a91fb7a..3d482980 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczOTAwWhcNMjAwODE3MDczOTAwWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANY0KZ8GRYywPHPb9MFyDyDQh54/V+QaGZL+JoswMKt5WUbRk1vAfNkZs3G1r+hZD/A7OpN1y1BvSlyJbS9sp9MCAwEAAaN/MH0wHQYDVR0OBBYEFK4PAAaCkwmSI6jNntGSYRxN85siME4GA1UdIwRHMEWAFK4PAAaCkwmSI6jNntGSYRxN85sioSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmVOjZUHCxT4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABub7gUiIQO2J+G5P8sw78pWegH4WPwAVXYPqkdj49vJ0R9xz2sB1o2lCz3cM2iVvXZQCtoHKM38typf1QGeG30=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczOTAwWhcNMjAwODE3MDczOTAwWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANY0KZ8GRYywPHPb9MFyDyDQh54/V+QaGZL+JoswMKt5WUbRk1vAfNkZs3G1r+hZD/A7OpN1y1BvSlyJbS9sp9MCAwEAAaN/MH0wHQYDVR0OBBYEFK4PAAaCkwmSI6jNntGSYRxN85siME4GA1UdIwRHMEWAFK4PAAaCkwmSI6jNntGSYRxN85sioSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmVOjZUHCxT4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABub7gUiIQO2J+G5P8sw78pWegH4WPwAVXYPqkdj49vJ0R9xz2sB1o2lCz3cM2iVvXZQCtoHKM38typf1QGeG30=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml
index a47f574e..2b701611 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
index 50664313..0d15f3eb 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczNzMxWhcNMjAwODE3MDczNzMxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmf57Rs0mLLo/bCWjeRD/31lxnKa+qCzbu/Kw7SuNfmrsoM8XRQZsttJ0W205vVS/KeWTD5lwvMeKt0unFqKj8CAwEAAaN/MH0wHQYDVR0OBBYEFDP6RZyMAof7vHj6IL/aqJRp92GUME4GA1UdIwRHMEWAFDP6RZyMAof7vHj6IL/aqJRp92GUoSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmF+iiXS05WUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJUO13OwzqCiSKk/JDRhWSIS1Ayzlq8dDkGzfdUcgaFtcBKwcPTBoudm1WhClGvcTAz+QTmNq9NsJurYJ3j5uQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczNzMxWhcNMjAwODE3MDczNzMxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmf57Rs0mLLo/bCWjeRD/31lxnKa+qCzbu/Kw7SuNfmrsoM8XRQZsttJ0W205vVS/KeWTD5lwvMeKt0unFqKj8CAwEAAaN/MH0wHQYDVR0OBBYEFDP6RZyMAof7vHj6IL/aqJRp92GUME4GA1UdIwRHMEWAFDP6RZyMAof7vHj6IL/aqJRp92GUoSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmF+iiXS05WUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJUO13OwzqCiSKk/JDRhWSIS1Ayzlq8dDkGzfdUcgaFtcBKwcPTBoudm1WhClGvcTAz+QTmNq9NsJurYJ3j5uQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-00_idp-metadata.xml b/swamid-1.0/nya-00_idp-metadata.xml
index 9f007729..ab4605ad 100644
--- a/swamid-1.0/nya-00_idp-metadata.xml
+++ b/swamid-1.0/nya-00_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-00.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMwzb8L94PvDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKp/QDavODPCr+HiGQD6KyoM/p4lRzcpA9tkoxeCuf8AbsVmRyoGF+dBRDjCmffCEHakv/Q9tYQz0HlUtw9h3gsCAwEAAaN/MH0wHQYDVR0OBBYEFOyWIZ+7fZA1tsvSQoLie/mXQ2c0ME4GA1UdIwRHMEWAFOyWIZ+7fZA1tsvSQoLie/mXQ2c0oSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAzDNvwv3g+8MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKThR/d5AIsFFVPnsL8FnZFlgM9hBkM18tSBdmG3h8Fi3yP7DTPg4eY5eV56PyzG4rN/0cgiRH1X47kgKgDF1io=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-00.ladok.umu.se:8452/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://nya-00.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8452/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://nya-00.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMwzb8L94PvDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKp/QDavODPCr+HiGQD6KyoM/p4lRzcpA9tkoxeCuf8AbsVmRyoGF+dBRDjCmffCEHakv/Q9tYQz0HlUtw9h3gsCAwEAAaN/MH0wHQYDVR0OBBYEFOyWIZ+7fZA1tsvSQoLie/mXQ2c0ME4GA1UdIwRHMEWAFOyWIZ+7fZA1tsvSQoLie/mXQ2c0oSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAzDNvwv3g+8MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKThR/d5AIsFFVPnsL8FnZFlgM9hBkM18tSBdmG3h8Fi3yP7DTPg4eY5eV56PyzG4rN/0cgiRH1X47kgKgDF1io=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-00.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml
index f774f90a..47c3a710 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/aws-sp-en">
-
<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://nya-01.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ OJxsyizOhif4JiOQYGdK4NHpby9naFNpF4IXwtagoLY6T9Gi5ktUfqSsqqTdak/6
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml
index 7c95995b..4a284184 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
index f27e34c2..71092680 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml
index 7fc0399a..cc4fba97 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
index 58c7f0b0..65a38e0b 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-01_idp-metadata.xml b/swamid-1.0/nya-01_idp-metadata.xml
index 788c826b..3fd72a21 100644
--- a/swamid-1.0/nya-01_idp-metadata.xml
+++ b/swamid-1.0/nya-01_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-01.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKA69vAYDwJaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANegZcyYM3geh+iNbBmWCfm1GxijeD4R/FHopfpxbhFYDXA9MM2lJ/c1LoZPOkzh4sZpwLqoWCELxjt/63v39+kCAwEAAaN/MH0wHQYDVR0OBBYEFH1DhE5N3yXeYWpWFEy3Hz+zb0/1ME4GA1UdIwRHMEWAFH1DhE5N3yXeYWpWFEy3Hz+zb0/1oSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAoDr28BgPAlowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKh5poTeJkNsHSlhyDcRdDKFXbsBNjOSC+mu4IqOmAp9wUWzxVVeWVAjBS1etVaWSY6Zyfo4W8lA4ybDhuIy2vc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-01.ladok.umu.se:8452/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://nya-01.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8452/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://nya-01.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKA69vAYDwJaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANegZcyYM3geh+iNbBmWCfm1GxijeD4R/FHopfpxbhFYDXA9MM2lJ/c1LoZPOkzh4sZpwLqoWCELxjt/63v39+kCAwEAAaN/MH0wHQYDVR0OBBYEFH1DhE5N3yXeYWpWFEy3Hz+zb0/1ME4GA1UdIwRHMEWAFH1DhE5N3yXeYWpWFEy3Hz+zb0/1oSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAoDr28BgPAlowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKh5poTeJkNsHSlhyDcRdDKFXbsBNjOSC+mu4IqOmAp9wUWzxVVeWVAjBS1etVaWSY6Zyfo4W8lA4ybDhuIy2vc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-01.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml
index 55cc3cd8..f61730a3 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/aws-sp-en">
-
<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://nya-02.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ N2E7dJ3CyH08jBFitMrgOIexNlMw697ne4jPm+Iv9iJU3BOiVGWLDa6EMg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml
index 9bfe5c65..2aed647e 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
index 2e2c7aaa..84360c8c 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml
index 35053d3f..90443ec0 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
index f66acdc4..22b5e760 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-02_idp-metadata.xml b/swamid-1.0/nya-02_idp-metadata.xml
index 4d86aa04..fbc50826 100644
--- a/swamid-1.0/nya-02_idp-metadata.xml
+++ b/swamid-1.0/nya-02_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-02.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOIyb07ec7AZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANX/PPn9NJHNR/QEBb3LIXx5NaHvO0ZtiQEtZBNQ1+rAFU5+GFCH885VAPllP1vSNG0mrvdtQ+kO3b2gwsdWlGkCAwEAAaN/MH0wHQYDVR0OBBYEFIJjGVQxRH3EsnjNvRF3S6Arf32NME4GA1UdIwRHMEWAFIJjGVQxRH3EsnjNvRF3S6Arf32NoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA4jJvTt5zsBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANUcGE0y/zBNlbBaB+mnlhHT5Qrby63Aw+wRO10AJFTc1cAKRaw1F8fPxkFwqCXjYx66tFTuO2Gdqj2CMI/KTS4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-02.ladok.umu.se:8452/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://nya-02.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8452/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://nya-02.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOIyb07ec7AZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANX/PPn9NJHNR/QEBb3LIXx5NaHvO0ZtiQEtZBNQ1+rAFU5+GFCH885VAPllP1vSNG0mrvdtQ+kO3b2gwsdWlGkCAwEAAaN/MH0wHQYDVR0OBBYEFIJjGVQxRH3EsnjNvRF3S6Arf32NME4GA1UdIwRHMEWAFIJjGVQxRH3EsnjNvRF3S6Arf32NoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA4jJvTt5zsBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANUcGE0y/zBNlbBaB+mnlhHT5Qrby63Aw+wRO10AJFTc1cAKRaw1F8fPxkFwqCXjYx66tFTuO2Gdqj2CMI/KTS4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-02.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml
index c63667d8..9f28564f 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/aws-sp-en">
-
<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://nya-03.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ xxsec10MaM5LRhAHDZrDVPMp/Q6JMCK3ZMvX1WyhhGdENT5CKTOwkoXa2g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml
index 4eec01ee..44578932 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
index a6086c01..0f6809fc 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTE5MTIyNDI2WhcNMjAwNTE2MTIyNDI2WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALkPGJdT2+8T/Tm5sEsm9Xtey1o7tzveQvmX3I8iJ89AdD2u7ZUNp5WNQv8/q0D2l+dU3TC+Zo3gPRzrL9rFWG0CAwEAAaN/MH0wHQYDVR0OBBYEFD+i/0toSkdU7jydFxT3Isa+PFIaME4GA1UdIwRHMEWAFD+i/0toSkdU7jydFxT3Isa+PFIaoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAhAzBsjMYSWIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADN2AhE4tEt2aTScozETDBHxPpKa0Tb6qr6Z71nYmm4a+EdL2D7rQuxtE1M9sn8RJ2dw+xrsTsMQv0TzER2N6ZQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTE5MTIyNDI2WhcNMjAwNTE2MTIyNDI2WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALkPGJdT2+8T/Tm5sEsm9Xtey1o7tzveQvmX3I8iJ89AdD2u7ZUNp5WNQv8/q0D2l+dU3TC+Zo3gPRzrL9rFWG0CAwEAAaN/MH0wHQYDVR0OBBYEFD+i/0toSkdU7jydFxT3Isa+PFIaME4GA1UdIwRHMEWAFD+i/0toSkdU7jydFxT3Isa+PFIaoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAhAzBsjMYSWIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADN2AhE4tEt2aTScozETDBHxPpKa0Tb6qr6Z71nYmm4a+EdL2D7rQuxtE1M9sn8RJ2dw+xrsTsMQv0TzER2N6ZQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml
index 4c8a96b3..e40a6b86 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
index 7d0c46f6..5f176115 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-03_idp-metadata.xml b/swamid-1.0/nya-03_idp-metadata.xml
index a03b957c..d6664c62 100644
--- a/swamid-1.0/nya-03_idp-metadata.xml
+++ b/swamid-1.0/nya-03_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-03.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK4kQYQVeuXFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV2djMup7U/4sYkuvCVD0Xowha7nj1U17i60MnvlUofYV22mvXkLqfljpU15g+91XIcxt3zl63YT2j1ioFrqukCAwEAAaN/MH0wHQYDVR0OBBYEFAKHV7McxE3XJqigJ+uf5j8DpHnCME4GA1UdIwRHMEWAFAKHV7McxE3XJqigJ+uf5j8DpHnCoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAriRBhBV65cUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADes7T57r0fxSfBmiM4Ne6X+i5QTRVODVkoUSsOjFE0Sr/gfuApjkePx5s5gcCGPx9v9wV5enUKv77qJJ9HjLCU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-03.ladok.umu.se:8452/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://nya-03.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8452/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://nya-03.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK4kQYQVeuXFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV2djMup7U/4sYkuvCVD0Xowha7nj1U17i60MnvlUofYV22mvXkLqfljpU15g+91XIcxt3zl63YT2j1ioFrqukCAwEAAaN/MH0wHQYDVR0OBBYEFAKHV7McxE3XJqigJ+uf5j8DpHnCME4GA1UdIwRHMEWAFAKHV7McxE3XJqigJ+uf5j8DpHnCoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAriRBhBV65cUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADes7T57r0fxSfBmiM4Ne6X+i5QTRVODVkoUSsOjFE0Sr/gfuApjkePx5s5gcCGPx9v9wV5enUKv77qJJ9HjLCU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-03.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml
index e29ea515..cd5697c9 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/aws-sp-en">
-
<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://nya-04.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ yfok40PeW6wNzSsPTbDuXCg5ylpa6erNDbWvovVYM6DNUpN0u4slj2kn5g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml
index 7faf0169..aaa93700 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
index bade67e8..ce726469 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml
index 822c6579..962ba540 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
index e78bfab2..25748ecd 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-04_idp-metadata.xml b/swamid-1.0/nya-04_idp-metadata.xml
index b77b542f..8d8a01c0 100644
--- a/swamid-1.0/nya-04_idp-metadata.xml
+++ b/swamid-1.0/nya-04_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-04.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJMOnU+BgpDoMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMVLWtGqTu6Hq/GT4Qz58PRGEP2l7VN9veA5YgBPy+KqN25RdwozIpSJFe7ek8E/PCAnOpT8agMhMDMzufO9hXsCAwEAAaN/MH0wHQYDVR0OBBYEFMMCJlwwelmtsroasR57Q+16sLU7ME4GA1UdIwRHMEWAFMMCJlwwelmtsroasR57Q+16sLU7oSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkAkw6dT4GCkOgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAn600lC8Qxd/TMyXMe/GgVD1P/WdIss5KV5sZlReOCfKFFrHSrXtrMs9soGwnwbXGXiY28JCsrEcM1cl3kTwRo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-04.ladok.umu.se:8452/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://nya-04.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8452/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://nya-04.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJMOnU+BgpDoMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMVLWtGqTu6Hq/GT4Qz58PRGEP2l7VN9veA5YgBPy+KqN25RdwozIpSJFe7ek8E/PCAnOpT8agMhMDMzufO9hXsCAwEAAaN/MH0wHQYDVR0OBBYEFMMCJlwwelmtsroasR57Q+16sLU7ME4GA1UdIwRHMEWAFMMCJlwwelmtsroasR57Q+16sLU7oSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkAkw6dT4GCkOgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAn600lC8Qxd/TMyXMe/GgVD1P/WdIss5KV5sZlReOCfKFFrHSrXtrMs9soGwnwbXGXiY28JCsrEcM1cl3kTwRo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-04.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml
index 4e37d321..c520d13a 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/aws-sp-en">
-
<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://nya-05.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ UloWvFxri1sjNtHE89jjeXRj2AEozuiMmMjOImiLXZKsc6KoZ6cBtwXuSg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml
index 3aee6545..f6c095af 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
index 4b4a937d..eb26a175 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml
index f1498c16..17f8cbb7 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
index 21c417e8..309251d1 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-05_idp-metadata.xml b/swamid-1.0/nya-05_idp-metadata.xml
index 8ad64ef7..52f87c27 100644
--- a/swamid-1.0/nya-05_idp-metadata.xml
+++ b/swamid-1.0/nya-05_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-05.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOa7g4siUuR9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOWW5xReFqnxP2vR63roPU9RnedknqIWybI6jAvZuGuM9OzKsOTxcRLu+fvE3Rxklgbk6HS95H1XhAtnpNTrFgUCAwEAAaN/MH0wHQYDVR0OBBYEFJsJjFrGfspuz4Y+4zCoWkRPWmETME4GA1UdIwRHMEWAFJsJjFrGfspuz4Y+4zCoWkRPWmEToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkA5ruDiyJS5H0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/9lH1pxsECfZ21kUsQaHvObS2aNVivsDkPvXMibMgAhqfS26AYbmHm/FoGokfmW15MBTwNHlxv2RFL9LwYKUY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-05.ladok.umu.se:8452/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://nya-05.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8452/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://nya-05.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOa7g4siUuR9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOWW5xReFqnxP2vR63roPU9RnedknqIWybI6jAvZuGuM9OzKsOTxcRLu+fvE3Rxklgbk6HS95H1XhAtnpNTrFgUCAwEAAaN/MH0wHQYDVR0OBBYEFJsJjFrGfspuz4Y+4zCoWkRPWmETME4GA1UdIwRHMEWAFJsJjFrGfspuz4Y+4zCoWkRPWmEToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkA5ruDiyJS5H0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/9lH1pxsECfZ21kUsQaHvObS2aNVivsDkPvXMibMgAhqfS26AYbmHm/FoGokfmW15MBTwNHlxv2RFL9LwYKUY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-05.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml
index 4bbac2de..a3a91c9a 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/aws-sp-en">
-
<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://nya-06.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ n8H5pFJ9CPQj2RwRs2Lf/i8+c1wXJhDwUJBTE0ypxh22prR5d92WZIemL3nH1Aq1
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml
index 98985e9d..44cffff7 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
index 099323b2..82dbbbae 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml
index c21ec576..286c4e04 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
index 1540f2d9..da47100e 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-06_idp-metadata.xml b/swamid-1.0/nya-06_idp-metadata.xml
index 8b23d958..bee57c00 100644
--- a/swamid-1.0/nya-06_idp-metadata.xml
+++ b/swamid-1.0/nya-06_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-06.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN+tyFDHCyK8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANc8/SRUH9QgNWfsjvm083N7oBRvipxUfU49NOwgZNh/ZhbQbXUedmJokgel1IJNf9BMf8XdYqCKHVkRK/FCK8MCAwEAAaN/MH0wHQYDVR0OBBYEFLD1zYxFkym08Q1Z9vgHt9MEgDVQME4GA1UdIwRHMEWAFLD1zYxFkym08Q1Z9vgHt9MEgDVQoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkA363IUMcLIrwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACEe3VliikmvVwcMwOKyQrPBzOuEZPz0paYjWrIIFd+CRVcveKGpqenBBU6frHPcEpdyUsSt2os/hG2xOdkwnc0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-06.ladok.umu.se:8452/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://nya-06.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8452/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://nya-06.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN+tyFDHCyK8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANc8/SRUH9QgNWfsjvm083N7oBRvipxUfU49NOwgZNh/ZhbQbXUedmJokgel1IJNf9BMf8XdYqCKHVkRK/FCK8MCAwEAAaN/MH0wHQYDVR0OBBYEFLD1zYxFkym08Q1Z9vgHt9MEgDVQME4GA1UdIwRHMEWAFLD1zYxFkym08Q1Z9vgHt9MEgDVQoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkA363IUMcLIrwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACEe3VliikmvVwcMwOKyQrPBzOuEZPz0paYjWrIIFd+CRVcveKGpqenBBU6frHPcEpdyUsSt2os/hG2xOdkwnc0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-06.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml
index e3af3c05..ec7d612b 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/aws-sp-en">
-
<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://nya-07.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ GQCEMYSG6ycLQ0LsSsNovS8tER3oMbuOt43AujZxkPQsGUXIkHNIoCfD2DuIcc4w
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml
index e0b87c00..79032739 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
index 29640852..3deb4d8d 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml
index c675fc74..7a1cee32 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
index 761608c2..c0d1d0ab 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-07_idp-metadata.xml b/swamid-1.0/nya-07_idp-metadata.xml
index aad48819..b687d390 100644
--- a/swamid-1.0/nya-07_idp-metadata.xml
+++ b/swamid-1.0/nya-07_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-07.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALKoroo0+vTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKYKort7X6AG/kdaHOuUfU4CVrq6ZMFf3YMT2e9YvGtW1Sw9e6gTlocxwNEc3suDg+b6QYLzJ4K11Zf08vHcEAMCAwEAAaN/MH0wHQYDVR0OBBYEFOByMDCI/N+2efAnH/fF9sI+Nr0lME4GA1UdIwRHMEWAFOByMDCI/N+2efAnH/fF9sI+Nr0loSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAsqiuijT69NswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHgf7NnD3ypfvKHBkh8mED1ft9DkS+Yfs9ViJpnRjePcJLmfhXPd/jveJS13Lf9K0zz1NEuX4QMPgzDWCo1kCgg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-07.ladok.umu.se:8452/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://nya-07.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8452/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://nya-07.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALKoroo0+vTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKYKort7X6AG/kdaHOuUfU4CVrq6ZMFf3YMT2e9YvGtW1Sw9e6gTlocxwNEc3suDg+b6QYLzJ4K11Zf08vHcEAMCAwEAAaN/MH0wHQYDVR0OBBYEFOByMDCI/N+2efAnH/fF9sI+Nr0lME4GA1UdIwRHMEWAFOByMDCI/N+2efAnH/fF9sI+Nr0loSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAsqiuijT69NswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHgf7NnD3ypfvKHBkh8mED1ft9DkS+Yfs9ViJpnRjePcJLmfhXPd/jveJS13Lf9K0zz1NEuX4QMPgzDWCo1kCgg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-07.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml
index 31cb73ef..ac145e33 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/aws-sp-en">
-
<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://nya-08.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ g5ahctVSR4PAiGMOtvqARpwdBj7fM3+Utym6dIClautnzeFrcyZRW8YMRg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml
index 3ed9e29b..529a49d0 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
index e6b9753c..c4b32aac 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml
index 3e536a29..27e15db9 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
index baa363c0..555c34b0 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ4Wlqm4ZWTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAxMTI5MTMzNzI1WhcNMjAxMTI2MTMzNzI1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANpz8+aOuWkpC6JLSnTpEV+dh9k40L74dNa8tqXlGh6xEYn+4XPKG70ScyjGZX+zUYfFQ81NgAI1LhLASFZJVUMCAwEAAaN/MH0wHQYDVR0OBBYEFPJrDTs9uaP5VQVa2VvwDubGH5KNME4GA1UdIwRHMEWAFPJrDTs9uaP5VQVa2VvwDubGH5KNoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAnhaWqbhlZNswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMbK+lB5gbxDntJMaqj3aPOe9YcBbfXGwluOMd1BziOXMj0Jb/nUBrzCIkRfKRqut26uRehXMNPH4V7fybpg2Io=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/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://nya-08.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/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://nya-08.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ4Wlqm4ZWTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAxMTI5MTMzNzI1WhcNMjAxMTI2MTMzNzI1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANpz8+aOuWkpC6JLSnTpEV+dh9k40L74dNa8tqXlGh6xEYn+4XPKG70ScyjGZX+zUYfFQ81NgAI1LhLASFZJVUMCAwEAAaN/MH0wHQYDVR0OBBYEFPJrDTs9uaP5VQVa2VvwDubGH5KNME4GA1UdIwRHMEWAFPJrDTs9uaP5VQVa2VvwDubGH5KNoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAnhaWqbhlZNswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMbK+lB5gbxDntJMaqj3aPOe9YcBbfXGwluOMd1BziOXMj0Jb/nUBrzCIkRfKRqut26uRehXMNPH4V7fybpg2Io=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-08_idp-metadata.xml b/swamid-1.0/nya-08_idp-metadata.xml
index 541c0a33..67c90b03 100644
--- a/swamid-1.0/nya-08_idp-metadata.xml
+++ b/swamid-1.0/nya-08_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-08.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKz/NholBowZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHYWHFHdyFzDSROrhUx225Cg+DFpTpBgJDd+xBMyTJyg2C2YIeD3UjCh+di2bO5o9aJykYNtTHPWGMaAnkkgSkCAwEAAaN/MH0wHQYDVR0OBBYEFEv6G3QhkabIy/bOesVPEEo4FOLAME4GA1UdIwRHMEWAFEv6G3QhkabIy/bOesVPEEo4FOLAoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkArP82GiUGjBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADQlbhQBwK1JEMJs6JPNK2ONVYkGamZpEDMI3McPvFxt9UeLrqZZrixmTG2wZFljFie06DUpnGnzthuiEWD1ueA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-08.ladok.umu.se:8452/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://nya-08.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8452/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://nya-08.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKz/NholBowZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHYWHFHdyFzDSROrhUx225Cg+DFpTpBgJDd+xBMyTJyg2C2YIeD3UjCh+di2bO5o9aJykYNtTHPWGMaAnkkgSkCAwEAAaN/MH0wHQYDVR0OBBYEFEv6G3QhkabIy/bOesVPEEo4FOLAME4GA1UdIwRHMEWAFEv6G3QhkabIy/bOesVPEEo4FOLAoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkArP82GiUGjBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADQlbhQBwK1JEMJs6JPNK2ONVYkGamZpEDMI3McPvFxt9UeLrqZZrixmTG2wZFljFie06DUpnGnzthuiEWD1ueA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-08.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml
index 6e63c3f1..7a8d5bcc 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/aws-sp-en">
-
<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://nya-09.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ VGHDJhfkfJ6xPJrFVTM4plJ4tZ00DzyRMKUSDkV5so7EB9ZgA889dAQHViyLvXrx
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml
index f1333414..fa86dcd0 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
index e619125c..be72edeb 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml
index 1d76d4f3..0651a2fa 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
index 174104f2..542e5188 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-09_idp-metadata.xml b/swamid-1.0/nya-09_idp-metadata.xml
index 95d08c49..6b421763 100644
--- a/swamid-1.0/nya-09_idp-metadata.xml
+++ b/swamid-1.0/nya-09_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-09.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALAOdDKUibLPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOMPaKw43Otk+1YULkGDTMssbof6RI5F2ki9c3uJV0VSmVN6oxGM42nA0EZXZsr3a7WNW2uM6KFCS54+m8L6ShkCAwEAAaN/MH0wHQYDVR0OBBYEFMhEwtYmHacMQ1/sNmZcq72tPa/eME4GA1UdIwRHMEWAFMhEwtYmHacMQ1/sNmZcq72tPa/eoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkAsA50MpSJss8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJT3NIwSYF1zUxrdv4OijD6U3ZG1M93Jw3F9TTRJcLGxH0nLZmnoDP/TTfV3ZmCLEr/O9kWgLNSVmsiw99ughd8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-09.ladok.umu.se:8452/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://nya-09.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8452/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://nya-09.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALAOdDKUibLPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOMPaKw43Otk+1YULkGDTMssbof6RI5F2ki9c3uJV0VSmVN6oxGM42nA0EZXZsr3a7WNW2uM6KFCS54+m8L6ShkCAwEAAaN/MH0wHQYDVR0OBBYEFMhEwtYmHacMQ1/sNmZcq72tPa/eME4GA1UdIwRHMEWAFMhEwtYmHacMQ1/sNmZcq72tPa/eoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkAsA50MpSJss8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJT3NIwSYF1zUxrdv4OijD6U3ZG1M93Jw3F9TTRJcLGxH0nLZmnoDP/TTfV3ZmCLEr/O9kWgLNSVmsiw99ughd8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-09.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml
index 0d8fba10..e940ca6b 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/aws-sp-en">
-
<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://nya-10.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ji8cswM9Yt1R1XEuVvfx1+gSrAPMcshA+UQ+AAaSnER7opP8TCqpmFYAyw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml
index 6a4155fe..81b0b13c 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
index 56c7bc29..443299c4 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml
index ced3f7ad..73ab1c34 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
index 62eb2512..f3be07af 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-10_idp-metadata.xml b/swamid-1.0/nya-10_idp-metadata.xml
index 35d620af..620d568f 100644
--- a/swamid-1.0/nya-10_idp-metadata.xml
+++ b/swamid-1.0/nya-10_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-10.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMEo0+TyDXm9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/a8N8t9pEJZFYtICHYoiFeSwXobYbhQGvEwOgvHYkHZVFzJMoSHEkhVU75KElE6Jbva7OvxvuaDjSio/cKbpkCAwEAAaN/MH0wHQYDVR0OBBYEFDdfJqJH49qu/R9U5/UZXiMKL7QLME4GA1UdIwRHMEWAFDdfJqJH49qu/R9U5/UZXiMKL7QLoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkAwSjT5PINeb0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEusDBOT2mhns8L1zDUd0OAY3mtsaCuYn8dKIh4EC2QGvk5wpyslElwcJTnnpihRB9pRgWJxbxgQF+ExL8JTF4Y=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-10.ladok.umu.se:8452/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://nya-10.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8452/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://nya-10.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMEo0+TyDXm9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/a8N8t9pEJZFYtICHYoiFeSwXobYbhQGvEwOgvHYkHZVFzJMoSHEkhVU75KElE6Jbva7OvxvuaDjSio/cKbpkCAwEAAaN/MH0wHQYDVR0OBBYEFDdfJqJH49qu/R9U5/UZXiMKL7QLME4GA1UdIwRHMEWAFDdfJqJH49qu/R9U5/UZXiMKL7QLoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkAwSjT5PINeb0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEusDBOT2mhns8L1zDUd0OAY3mtsaCuYn8dKIh4EC2QGvk5wpyslElwcJTnnpihRB9pRgWJxbxgQF+ExL8JTF4Y=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-10.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml
index 443ae18e..735c61de 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-11.ladok.umu.se/aws-sp-en">
-
<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://nya-11.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ee2cPMLHZ8uTBXSNov8FszLqVb+2fSkTkc8L3Jvnc979iizqAcW/c102dg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml
index 07821965..e69b1a92 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Yhj3Ud+jxptxLC2+YavcV0QU7WBCIl9InE1oR8rAjpGVjGSO3U/6DA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
index 2ba7519c..0be5759b 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOD1v94MfUg7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMzWhcNMjAxMTIxMTIxODMzWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANhiKrdBKKMgbq+7RYDykBMWJwC5VD5Ml0nk7sA4Ow/5iK6CPngo+xbja40zYHlgnt6XZM86veYurP0Wvoe1/eUCAwEAAaN/MH0wHQYDVR0OBBYEFNygyxHSHhB8lvdUIDNzblaMy4BGME4GA1UdIwRHMEWAFNygyxHSHhB8lvdUIDNzblaMy4BGoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkA4PW/3gx9SDswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADuQczgEjD9Uno3wg9rjGwBOfe4p33yoAgQbWiYfQLlIdwDqGOleleuLIyMwl+XdUPvxZen2XWpUVvriUYqAd+o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/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://nya-11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/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://nya-11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOD1v94MfUg7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMzWhcNMjAxMTIxMTIxODMzWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANhiKrdBKKMgbq+7RYDykBMWJwC5VD5Ml0nk7sA4Ow/5iK6CPngo+xbja40zYHlgnt6XZM86veYurP0Wvoe1/eUCAwEAAaN/MH0wHQYDVR0OBBYEFNygyxHSHhB8lvdUIDNzblaMy4BGME4GA1UdIwRHMEWAFNygyxHSHhB8lvdUIDNzblaMy4BGoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkA4PW/3gx9SDswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADuQczgEjD9Uno3wg9rjGwBOfe4p33yoAgQbWiYfQLlIdwDqGOleleuLIyMwl+XdUPvxZen2XWpUVvriUYqAd+o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml
index f5894ab6..1414b868 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ I4tiNRJDuFIy2L7PegtOwoBAm9rDP5c2Q06DX+t7nFulPL9mWLufmw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
index 0c0e3ac2..cb295d43 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKNu6sSUB8iCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM0WhcNMjAxMTIxMTIxODM0WjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMP1s7FqfCLa/7JjnUt/ozFU65AXJxyFQuOM0wFwhajuXi98GzxDYFoC/NrMVxdNy64szP3ivqoMxJ5hxyr6Lm0CAwEAAaN/MH0wHQYDVR0OBBYEFDX59uQwWp2FIyRH8D4+r93lOxN7ME4GA1UdIwRHMEWAFDX59uQwWp2FIyRH8D4+r93lOxN7oSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAo27qxJQHyIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUnZ5tebvOvgVR2nUBV5VvDF2jWHcK62dAA1VEr0YSaUruFsYnkUDbDh/6xe5hiZJ5qVktwtOUoyt2TPuv40uI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/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://nya-11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/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://nya-11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKNu6sSUB8iCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM0WhcNMjAxMTIxMTIxODM0WjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMP1s7FqfCLa/7JjnUt/ozFU65AXJxyFQuOM0wFwhajuXi98GzxDYFoC/NrMVxdNy64szP3ivqoMxJ5hxyr6Lm0CAwEAAaN/MH0wHQYDVR0OBBYEFDX59uQwWp2FIyRH8D4+r93lOxN7ME4GA1UdIwRHMEWAFDX59uQwWp2FIyRH8D4+r93lOxN7oSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAo27qxJQHyIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUnZ5tebvOvgVR2nUBV5VvDF2jWHcK62dAA1VEr0YSaUruFsYnkUDbDh/6xe5hiZJ5qVktwtOUoyt2TPuv40uI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-11_idp-metadata.xml b/swamid-1.0/nya-11_idp-metadata.xml
index 094e349e..695c1680 100644
--- a/swamid-1.0/nya-11_idp-metadata.xml
+++ b/swamid-1.0/nya-11_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-11.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJTYM9SYrSXSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKo/IDat4E95yZ7aJfxNFchadvdSbfbyogJwoTio7aD1GTSrTyoQn9OSdT2jUk2wpbnHptfQpn3v2GvyzU+sfQkCAwEAAaN/MH0wHQYDVR0OBBYEFG04HhheVVkX2H5US7A4zfj3/08DME4GA1UdIwRHMEWAFG04HhheVVkX2H5US7A4zfj3/08DoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAlNgz1JitJdIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD+hVvsZBbErHM/dYqvr/9eOCNhkiqKZWj8ZJ4+XrCpFlfr9iTDkD1WR9XflHeQHuwpzDrbZXZG3h7lwgK9kpck=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-11.ladok.umu.se:8452/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://nya-11.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8452/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://nya-11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJTYM9SYrSXSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKo/IDat4E95yZ7aJfxNFchadvdSbfbyogJwoTio7aD1GTSrTyoQn9OSdT2jUk2wpbnHptfQpn3v2GvyzU+sfQkCAwEAAaN/MH0wHQYDVR0OBBYEFG04HhheVVkX2H5US7A4zfj3/08DME4GA1UdIwRHMEWAFG04HhheVVkX2H5US7A4zfj3/08DoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAlNgz1JitJdIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD+hVvsZBbErHM/dYqvr/9eOCNhkiqKZWj8ZJ4+XrCpFlfr9iTDkD1WR9XflHeQHuwpzDrbZXZG3h7lwgK9kpck=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-11.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml
index efffbbef..becb8eea 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/aws-sp-en">
-
<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://nya-12.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ D0eoqGxLTvTqC2+hDxNXRe1LrUoaBIvcLqssy5jvjRX+vi0ckO5RddMIgQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml
index 924abe30..e5278d11 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Az4j0CNfaNbS78KQQcfiQxuTx9K1tyVdN42+LYD2jnfsXb9o8SbMGQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
index ee8ecfaf..6f05ac3d 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM5iqAQferc+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANVwYAXXV7b/vWTTy1jOQLwOsT0D46gPFA7tdiN54IHg/ujGrgOmAIkKmmdYCyp2KwuvTSK77P8HuuyxP4cpn3cCAwEAAaN/MH0wHQYDVR0OBBYEFE7CUZaNSU9t7G2MFT0CJZbVYS+4ME4GA1UdIwRHMEWAFE7CUZaNSU9t7G2MFT0CJZbVYS+4oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkAzmKoBB96tz4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKWclSMyitQ9oUQXMOFR9a/dFiF4dRgqInpN+tiY328Esgg9EYcBGbJfXU0LKynbNW/yxXSCgKdE4saJeFiLwbQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/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://nya-12.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/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://nya-12.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM5iqAQferc+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANVwYAXXV7b/vWTTy1jOQLwOsT0D46gPFA7tdiN54IHg/ujGrgOmAIkKmmdYCyp2KwuvTSK77P8HuuyxP4cpn3cCAwEAAaN/MH0wHQYDVR0OBBYEFE7CUZaNSU9t7G2MFT0CJZbVYS+4ME4GA1UdIwRHMEWAFE7CUZaNSU9t7G2MFT0CJZbVYS+4oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkAzmKoBB96tz4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKWclSMyitQ9oUQXMOFR9a/dFiF4dRgqInpN+tiY328Esgg9EYcBGbJfXU0LKynbNW/yxXSCgKdE4saJeFiLwbQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml
index a9e959a0..2f267ef7 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ WynBnDp4Kls1EPHgF/0Y7q7NEFyXT4oK4ck3493dfaX6s5viWysI2Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
index 49e49bc5..0f5989ac 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOiPu5Yiq3ItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxucHWYbWCQsuSlfHfncy3UyrA82yL4tWZlmPNdjJE3QKGrhfJKum5JZJky5E+53G16EXZvIhwDweQYHKXSOPECAwEAAaN/MH0wHQYDVR0OBBYEFAEcaJ/NbUlh3Daztg6SutOyobU2ME4GA1UdIwRHMEWAFAEcaJ/NbUlh3Daztg6SutOyobU2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA6I+7liKrci0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEc6MiJT8ttc9fqvEg5BCq0s65pLeobSDzqG81c8UEu60+4+PvLRLNhIak9rURmFNiuZngdcRYHjfceJh36UhMs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/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://nya-12.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/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://nya-12.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOiPu5Yiq3ItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxucHWYbWCQsuSlfHfncy3UyrA82yL4tWZlmPNdjJE3QKGrhfJKum5JZJky5E+53G16EXZvIhwDweQYHKXSOPECAwEAAaN/MH0wHQYDVR0OBBYEFAEcaJ/NbUlh3Daztg6SutOyobU2ME4GA1UdIwRHMEWAFAEcaJ/NbUlh3Daztg6SutOyobU2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA6I+7liKrci0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEc6MiJT8ttc9fqvEg5BCq0s65pLeobSDzqG81c8UEu60+4+PvLRLNhIak9rURmFNiuZngdcRYHjfceJh36UhMs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-12_idp-metadata.xml b/swamid-1.0/nya-12_idp-metadata.xml
index d146475d..d7b4fa91 100644
--- a/swamid-1.0/nya-12_idp-metadata.xml
+++ b/swamid-1.0/nya-12_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-12.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPTA3cImC78JMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMEQ4TrvfZzLuoobaoOFWPDm08e8HO4PyM90Wz6Nf7Hj3HOnRqRfPuSMTMN7zKl1hfvWHsnj3EEu4SQz/r+1gLECAwEAAaN/MH0wHQYDVR0OBBYEFKixo3CSAfmMpIHHU0P82aUV1kN2ME4GA1UdIwRHMEWAFKixo3CSAfmMpIHHU0P82aUV1kN2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA9MDdwiYLvwkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAb5jPzG+RhntGrVkcsFo2xccsQzkRxMkcFlEpEZFSwbVuQokNqNhHB62cP2HsiYyEVrWUPYfoZNGljqqrRzj8M=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-12.ladok.umu.se:8452/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://nya-12.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8452/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://nya-12.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPTA3cImC78JMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMEQ4TrvfZzLuoobaoOFWPDm08e8HO4PyM90Wz6Nf7Hj3HOnRqRfPuSMTMN7zKl1hfvWHsnj3EEu4SQz/r+1gLECAwEAAaN/MH0wHQYDVR0OBBYEFKixo3CSAfmMpIHHU0P82aUV1kN2ME4GA1UdIwRHMEWAFKixo3CSAfmMpIHHU0P82aUV1kN2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA9MDdwiYLvwkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAb5jPzG+RhntGrVkcsFo2xccsQzkRxMkcFlEpEZFSwbVuQokNqNhHB62cP2HsiYyEVrWUPYfoZNGljqqrRzj8M=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-12.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml
index 47087002..7264ae1b 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-13.ladok.umu.se/aws-sp-en">
-
<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://nya-13.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ar1z5nbbSvQmbGQ9X3H3/JRxJ8pW/dJ/6fdEpNcaQ5mE8RFiL3xmX71sfw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml
index 0d87e4a7..b16e0c04 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-13.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ KOvo9bP1zEb49xBfOdXDCo0L2J++CLnLAeFzs4KnJIL5q/TSsgSquw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
index c1265c7e..9e3a750a 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMcAzXq0glwMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ0WhcNMjAxMTIxMTIxODQ0WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMIVMvH7CI4krt6mU6UHa9GFd4L+TOK/yNxNjG1+Ti1g2swD3xTo/vDgoBSskbocvYj9jhCL5rsvlCl3s7lldNMCAwEAAaN/MH0wHQYDVR0OBBYEFDwQJJNFIi5fzjF9MpqrLJAW9qDKME4GA1UdIwRHMEWAFDwQJJNFIi5fzjF9MpqrLJAW9qDKoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkAxwDNerSCXAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ5qPgGhML2DOJ95T7nSbZy/MTWKmgWxuHa/iiE9tT1nAlYOOgjRux/yVb0r4ybHgtKlbKwrTk1B18lbLVxq82I=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/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://nya-13.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/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://nya-13.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMcAzXq0glwMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ0WhcNMjAxMTIxMTIxODQ0WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMIVMvH7CI4krt6mU6UHa9GFd4L+TOK/yNxNjG1+Ti1g2swD3xTo/vDgoBSskbocvYj9jhCL5rsvlCl3s7lldNMCAwEAAaN/MH0wHQYDVR0OBBYEFDwQJJNFIi5fzjF9MpqrLJAW9qDKME4GA1UdIwRHMEWAFDwQJJNFIi5fzjF9MpqrLJAW9qDKoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkAxwDNerSCXAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ5qPgGhML2DOJ95T7nSbZy/MTWKmgWxuHa/iiE9tT1nAlYOOgjRux/yVb0r4ybHgtKlbKwrTk1B18lbLVxq82I=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml
index ed414f72..9738112a 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-13.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ckYXvx6nFZB64nlo6U7iGtYOOTI8Q8een1wwWi55ewy1ptdyuk9B2w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
index f6a8f176..6930501f 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPWvSRoLpY6pMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ1WhcNMjAxMTIxMTIxODQ1WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8tgFGJ4NYVnsRydcbNd6aMuT9ugcZ2XFLdc4a6yFYOHB/YdTywRnLUgVK+nnbhXoIBa+u4pWwZ0Q7P04ErcqsCAwEAAaN/MH0wHQYDVR0OBBYEFMGJSwi5UwFnZ90jBdr9+zw2XQpPME4GA1UdIwRHMEWAFMGJSwi5UwFnZ90jBdr9+zw2XQpPoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA9a9JGguljqkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC4mUcOfrC2eYn7EULhIvOUJ4X9BMRUosM7OCjUrKjYgM3Mb5VO6bF6GXCqTBhWyRSsRUFhMfl+pefRLjApBCEo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/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://nya-13.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/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://nya-13.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPWvSRoLpY6pMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ1WhcNMjAxMTIxMTIxODQ1WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8tgFGJ4NYVnsRydcbNd6aMuT9ugcZ2XFLdc4a6yFYOHB/YdTywRnLUgVK+nnbhXoIBa+u4pWwZ0Q7P04ErcqsCAwEAAaN/MH0wHQYDVR0OBBYEFMGJSwi5UwFnZ90jBdr9+zw2XQpPME4GA1UdIwRHMEWAFMGJSwi5UwFnZ90jBdr9+zw2XQpPoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA9a9JGguljqkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC4mUcOfrC2eYn7EULhIvOUJ4X9BMRUosM7OCjUrKjYgM3Mb5VO6bF6GXCqTBhWyRSsRUFhMfl+pefRLjApBCEo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-13_idp-metadata.xml b/swamid-1.0/nya-13_idp-metadata.xml
index f332aa82..fba567b7 100644
--- a/swamid-1.0/nya-13_idp-metadata.xml
+++ b/swamid-1.0/nya-13_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-13.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANhB8bHvFgrDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEiD0Y2J0Jx2Oj44ttwRhT7BgG+V1CIYlZuooERf1FPDID9SPcL49RdIab+GbVgaied/TufMqgZQjT+FBxHqDUCAwEAAaN/MH0wHQYDVR0OBBYEFKn/tAngPFBTwEWeClg12DcUz4+/ME4GA1UdIwRHMEWAFKn/tAngPFBTwEWeClg12DcUz4+/oSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA2EHxse8WCsMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHayMcM8zX1qGEJgRcte0QvxWfp/KSrYzHdGD0xAhWDxf/DaWl3V8onbfrUxd7UaNBJw+iZk34jcwD/rzOwX3mw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-13.ladok.umu.se:8452/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://nya-13.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8452/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://nya-13.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANhB8bHvFgrDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEiD0Y2J0Jx2Oj44ttwRhT7BgG+V1CIYlZuooERf1FPDID9SPcL49RdIab+GbVgaied/TufMqgZQjT+FBxHqDUCAwEAAaN/MH0wHQYDVR0OBBYEFKn/tAngPFBTwEWeClg12DcUz4+/ME4GA1UdIwRHMEWAFKn/tAngPFBTwEWeClg12DcUz4+/oSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA2EHxse8WCsMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHayMcM8zX1qGEJgRcte0QvxWfp/KSrYzHdGD0xAhWDxf/DaWl3V8onbfrUxd7UaNBJw+iZk34jcwD/rzOwX3mw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-13.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml
index 3abd3959..d588a95b 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-14.ladok.umu.se/aws-sp-en">
-
<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://nya-14.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ZeWHUJ7G/swyYxw1UwtS+gdeCjKd91Ua1qSSCgv8HztqgPgzMtDP0bHic1pyFZKs
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml
index 8ab09e65..3bd694d1 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-14.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Nv4iQyOXosX6n4U5VL/OwTA+TIM2I07U3eJfoqIr6eLvYVcEHiPMzQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
index 35613e3c..efd88005 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOhZAAB6dbhUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIxMTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYI2pI8Qx3qXRAuoWoLzX8EnuZtB7S1AH9BHmLQrK3egX0tuvF9LSRbow1cE4LBC/AAsep0vrXBvA/Pc0MepG0CAwEAAaN/MH0wHQYDVR0OBBYEFBCNHd+G+aR8LQkQ2oxuG+CJR1VWME4GA1UdIwRHMEWAFBCNHd+G+aR8LQkQ2oxuG+CJR1VWoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA6FkAAHp1uFQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEMAE2PJ6WQwbFWmqZD/+gwsEK5b5JKt3eEsf+MqZSemZhmAmWINNAPYjdTcnUkN62oI1Cei4ndDzD1x5tII1HY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/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://nya-14.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/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://nya-14.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOhZAAB6dbhUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIxMTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYI2pI8Qx3qXRAuoWoLzX8EnuZtB7S1AH9BHmLQrK3egX0tuvF9LSRbow1cE4LBC/AAsep0vrXBvA/Pc0MepG0CAwEAAaN/MH0wHQYDVR0OBBYEFBCNHd+G+aR8LQkQ2oxuG+CJR1VWME4GA1UdIwRHMEWAFBCNHd+G+aR8LQkQ2oxuG+CJR1VWoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA6FkAAHp1uFQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEMAE2PJ6WQwbFWmqZD/+gwsEK5b5JKt3eEsf+MqZSemZhmAmWINNAPYjdTcnUkN62oI1Cei4ndDzD1x5tII1HY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml
index 71145aa8..0fe25e9f 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-14.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ nmOWiIiH9RKtRI4u5ypWzfu3S6XDcYrTiNeZeGyTB4v6bu74nFyzbA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
index 64ef2bcc..a7343be9 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANdvOCmSmyJRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODU0WhcNMjAxMTIxMTIxODU0WjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAObYpBsWnkmBYaOiXBA9LCdqIhv98KuIkpQEJHf1V0yV4uuPTd0vSAA/jFFujX8ijm6KkZQdNpTD5t8iFYNuCbsCAwEAAaN/MH0wHQYDVR0OBBYEFA98b3vQH4QfZyGflpm4zx3rS1OsME4GA1UdIwRHMEWAFA98b3vQH4QfZyGflpm4zx3rS1OsoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA1284KZKbIlEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/ECeeRCjEyum4Qnaw1PafRry/XHU6Ib/aueL320OS7p7YpBpKE5h2ge/GvlPxY5rhvilbR0YuQEvqFDipMFmQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/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://nya-14.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/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://nya-14.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANdvOCmSmyJRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODU0WhcNMjAxMTIxMTIxODU0WjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAObYpBsWnkmBYaOiXBA9LCdqIhv98KuIkpQEJHf1V0yV4uuPTd0vSAA/jFFujX8ijm6KkZQdNpTD5t8iFYNuCbsCAwEAAaN/MH0wHQYDVR0OBBYEFA98b3vQH4QfZyGflpm4zx3rS1OsME4GA1UdIwRHMEWAFA98b3vQH4QfZyGflpm4zx3rS1OsoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA1284KZKbIlEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/ECeeRCjEyum4Qnaw1PafRry/XHU6Ib/aueL320OS7p7YpBpKE5h2ge/GvlPxY5rhvilbR0YuQEvqFDipMFmQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-14_idp-metadata.xml b/swamid-1.0/nya-14_idp-metadata.xml
index cfddf55f..c21ad583 100644
--- a/swamid-1.0/nya-14_idp-metadata.xml
+++ b/swamid-1.0/nya-14_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-14.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKVuYUnkM40CMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMgQ40VoYizXIJzS/qJbOShmDvad+66e/9tR2ROYm+Vdk4EBwy6kolRDRbuCWLnsgwV5FaBXlaUsw8gtCoAy6GcCAwEAAaN/MH0wHQYDVR0OBBYEFLFkOAfP5Z6ZYdRVj7QPgjIquSiKME4GA1UdIwRHMEWAFLFkOAfP5Z6ZYdRVj7QPgjIquSiKoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkApW5hSeQzjQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEOBTsWn5X3pB0hta401DhV2MO9xIMA0GdqTLnuujAMqTOoDtFC1sdT+iD0m48MK0Wdfyz4jfnV+XfCh4pcCD8U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-14.ladok.umu.se:8452/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://nya-14.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8452/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://nya-14.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKVuYUnkM40CMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMgQ40VoYizXIJzS/qJbOShmDvad+66e/9tR2ROYm+Vdk4EBwy6kolRDRbuCWLnsgwV5FaBXlaUsw8gtCoAy6GcCAwEAAaN/MH0wHQYDVR0OBBYEFLFkOAfP5Z6ZYdRVj7QPgjIquSiKME4GA1UdIwRHMEWAFLFkOAfP5Z6ZYdRVj7QPgjIquSiKoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkApW5hSeQzjQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEOBTsWn5X3pB0hta401DhV2MO9xIMA0GdqTLnuujAMqTOoDtFC1sdT+iD0m48MK0Wdfyz4jfnV+XfCh4pcCD8U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-14.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml
index a9f8e6b2..bca0532b 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-15.ladok.umu.se/aws-sp-en">
-
<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://nya-15.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ W0+9QcTj4ZQCjZo9d6upjsbAo/Pp6MGuOLAcRCqPt1QiE55EBnAisZmbxA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml
index b6ec45ab..5d740f2d 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-15.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ blX3nKB5ALKFaDwOBgSsoQ2FFmxfcp5aq+/cX4uEvZ7lpSW1Fx3Xnn/4TgCkuBZ+
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
index 93d898e9..e5ea07a4 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ5EIPWZsBq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ1WhcNMjAxMTIxMTIxOTQ1WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOPtej8GOoZ5sh1H5+prjFJWuIqshuppbewtJgnJvkU3/2LEiCc5QCOd2ikErB2qBH91gMH5YwPKe5CWhJz10kkCAwEAAaN/MH0wHQYDVR0OBBYEFOicqHOLp4Pu1kpz1mAY6JErEevLME4GA1UdIwRHMEWAFOicqHOLp4Pu1kpz1mAY6JErEevLoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAnkQg9ZmwGrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGTajMoPPmg1kasLdpiMT318hDSbgED/rQ4oL8hK8EezdPk5qDLFBj+nC6M2IaV+ooBwkjlQClL8nfWaTJVYvoI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/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://nya-15.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/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://nya-15.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ5EIPWZsBq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ1WhcNMjAxMTIxMTIxOTQ1WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOPtej8GOoZ5sh1H5+prjFJWuIqshuppbewtJgnJvkU3/2LEiCc5QCOd2ikErB2qBH91gMH5YwPKe5CWhJz10kkCAwEAAaN/MH0wHQYDVR0OBBYEFOicqHOLp4Pu1kpz1mAY6JErEevLME4GA1UdIwRHMEWAFOicqHOLp4Pu1kpz1mAY6JErEevLoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAnkQg9ZmwGrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGTajMoPPmg1kasLdpiMT318hDSbgED/rQ4oL8hK8EezdPk5qDLFBj+nC6M2IaV+ooBwkjlQClL8nfWaTJVYvoI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml
index 8ae7d1e3..eada0c9a 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-15.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ LvKOxIWSVyp4rJKk+olbaIS8f9RNriNbnEXCWJSRHpUOHWiUgWCu7A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
index d82e6995..919a3d48 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP6Q22y7RrN3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ2WhcNMjAxMTIxMTIxOTQ2WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK91f1aF8kYYjrGZe5AIRqqsN54fUQmSX/knl0Nru30OoeVmtBgPVMrWarRUswdQJY0bDLHofOvwfEJScHOuNnkCAwEAAaN/MH0wHQYDVR0OBBYEFOw9ls1EMGTRho6Z3dBMEM7sJ9q9ME4GA1UdIwRHMEWAFOw9ls1EMGTRho6Z3dBMEM7sJ9q9oSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkA/pDbbLtGs3cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGZC8QrUQs+MrjJ6U77AStlzBGgvgBG395Y2tQx4s6yr8vGJUUbfmVfojjqKqTOnhDQsX+IkZ3Pijv3drTkvLAc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/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://nya-15.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/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://nya-15.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP6Q22y7RrN3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ2WhcNMjAxMTIxMTIxOTQ2WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK91f1aF8kYYjrGZe5AIRqqsN54fUQmSX/knl0Nru30OoeVmtBgPVMrWarRUswdQJY0bDLHofOvwfEJScHOuNnkCAwEAAaN/MH0wHQYDVR0OBBYEFOw9ls1EMGTRho6Z3dBMEM7sJ9q9ME4GA1UdIwRHMEWAFOw9ls1EMGTRho6Z3dBMEM7sJ9q9oSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkA/pDbbLtGs3cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGZC8QrUQs+MrjJ6U77AStlzBGgvgBG395Y2tQx4s6yr8vGJUUbfmVfojjqKqTOnhDQsX+IkZ3Pijv3drTkvLAc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-15_idp-metadata.xml b/swamid-1.0/nya-15_idp-metadata.xml
index 36a61400..f353ac61 100644
--- a/swamid-1.0/nya-15_idp-metadata.xml
+++ b/swamid-1.0/nya-15_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-15.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL39oDbalwq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANADC2tewqf0MKGtvObf8peBvzLuf2gzL4420IUXySOdRXYc4Aplrngsp6bS4GtTlNt5/LQiuqd+nOtKUaE+Tl8CAwEAAaN/MH0wHQYDVR0OBBYEFMjIA5ygeyXCMWYvcxxHOvWTNu5qME4GA1UdIwRHMEWAFMjIA5ygeyXCMWYvcxxHOvWTNu5qoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAvf2gNtqXCrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGy1bmQP4Z1GVxmVjOiArQE/81K1Z6sotYQ8uE4LZpPDjeO8yQ/fdo4ErhyaerkMhDfzLdZMgxOE7a4GiY7VzH0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-15.ladok.umu.se:8452/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://nya-15.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8452/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://nya-15.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL39oDbalwq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANADC2tewqf0MKGtvObf8peBvzLuf2gzL4420IUXySOdRXYc4Aplrngsp6bS4GtTlNt5/LQiuqd+nOtKUaE+Tl8CAwEAAaN/MH0wHQYDVR0OBBYEFMjIA5ygeyXCMWYvcxxHOvWTNu5qME4GA1UdIwRHMEWAFMjIA5ygeyXCMWYvcxxHOvWTNu5qoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAvf2gNtqXCrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGy1bmQP4Z1GVxmVjOiArQE/81K1Z6sotYQ8uE4LZpPDjeO8yQ/fdo4ErhyaerkMhDfzLdZMgxOE7a4GiY7VzH0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-15.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml
index f18d9785..83bbd9b1 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/aws-sp-en">
-
<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://nya-16.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ MEA25rcxC6D2hDL+ZQf5oi+nGHJ1PH9Qm+R9FhZRYjtAiMEy3ZKlyTDizw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml
index 8b1c1603..3a135d48 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
index 30acf7b4..8a691478 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/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://nya-16.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/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://nya-16.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml
index a856fb2d..f8782ec6 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
index 7cb4c972..009efc5d 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/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://nya-16.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/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://nya-16.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-16_idp-metadata.xml b/swamid-1.0/nya-16_idp-metadata.xml
index bbf3bdbb..d1e5538e 100644
--- a/swamid-1.0/nya-16_idp-metadata.xml
+++ b/swamid-1.0/nya-16_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-16.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIGeNY16cTPJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANIEbjIpI2I3/FTTZKnLB0GzRxZ+mBkDRwi9V+fYsB+8+AoUid0sr4xjBbKPfZDEXlpECURqozI/SKX2v1YPKeMCAwEAAaN/MH0wHQYDVR0OBBYEFIC1A6zR9zW9llh7OCLrhlLUOCydME4GA1UdIwRHMEWAFIC1A6zR9zW9llh7OCLrhlLUOCydoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAgZ41jXpxM8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT8Ea90tBi8eLdf69F9b5LLf0yXrb72eun/wO5MXR+z0/tS8Xzo8t+M8uc1cWey1uXSYdQEV3YzxquM4WydlIo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-16.ladok.umu.se:8452/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://nya-16.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8452/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://nya-16.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIGeNY16cTPJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANIEbjIpI2I3/FTTZKnLB0GzRxZ+mBkDRwi9V+fYsB+8+AoUid0sr4xjBbKPfZDEXlpECURqozI/SKX2v1YPKeMCAwEAAaN/MH0wHQYDVR0OBBYEFIC1A6zR9zW9llh7OCLrhlLUOCydME4GA1UdIwRHMEWAFIC1A6zR9zW9llh7OCLrhlLUOCydoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAgZ41jXpxM8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT8Ea90tBi8eLdf69F9b5LLf0yXrb72eun/wO5MXR+z0/tS8Xzo8t+M8uc1cWey1uXSYdQEV3YzxquM4WydlIo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-16.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml
index bdcba403..d58f7ae2 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/aws-sp-en">
-
<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://nya-17.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ kcHeJzjoVblztcwxiC7gCrQIPdClYGG3O2ID8UyVskpag7HyqFhy3lYthw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml
index 5f89c864..a4758fe2 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
index 93885bc0..f168e065 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/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://nya-17.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/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://nya-17.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml
index c5f5050d..90fd8073 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
index d8978dd3..eeb72f8a 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/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://nya-17.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/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://nya-17.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-17_idp-metadata.xml b/swamid-1.0/nya-17_idp-metadata.xml
index 2e141dca..e316d6d2 100644
--- a/swamid-1.0/nya-17_idp-metadata.xml
+++ b/swamid-1.0/nya-17_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-17.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI7Pd+S0tTRLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKwDdTxqmyNhI8hiu2wuwtRCtiCUrDARPNXRuxoCFM0k5L50sshxUbUskPc9r4hiQVldmhjsSuJa0SrJd7HnJZ0CAwEAAaN/MH0wHQYDVR0OBBYEFMM4b+D1TbPEhbmFwunrbBqyN3vuME4GA1UdIwRHMEWAFMM4b+D1TbPEhbmFwunrbBqyN3vuoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAjs935LS1NEswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIWC10wW8jdqIE13v7DGnHdJpnGa7HL1P4aG2+RqJ5nwOcfI8UP+Nm158hzEKujw93zjkXkeJbPIMZdUPTnmNA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-17.ladok.umu.se:8452/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://nya-17.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8452/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://nya-17.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI7Pd+S0tTRLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKwDdTxqmyNhI8hiu2wuwtRCtiCUrDARPNXRuxoCFM0k5L50sshxUbUskPc9r4hiQVldmhjsSuJa0SrJd7HnJZ0CAwEAAaN/MH0wHQYDVR0OBBYEFMM4b+D1TbPEhbmFwunrbBqyN3vuME4GA1UdIwRHMEWAFMM4b+D1TbPEhbmFwunrbBqyN3vuoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAjs935LS1NEswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIWC10wW8jdqIE13v7DGnHdJpnGa7HL1P4aG2+RqJ5nwOcfI8UP+Nm158hzEKujw93zjkXkeJbPIMZdUPTnmNA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-17.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml
index 90fddfc3..cbdd7e9c 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/aws-sp-en">
-
<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://nya-18.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ A6GkvQRQ+zMPxxZ8Jzq2pUpmZDR8IPAz2457UJP8N4Wa3PuH3HsKi5OilQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml
index cbee8e5e..68ee487c 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
index 55cca910..098f7092 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/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://nya-18.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/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://nya-18.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml
index cffd282a..23727b2e 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
index 5882a150..f3e21ad9 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/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://nya-18.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/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://nya-18.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-18_idp-metadata.xml b/swamid-1.0/nya-18_idp-metadata.xml
index 1cd0cf9a..de4e0ca0 100644
--- a/swamid-1.0/nya-18_idp-metadata.xml
+++ b/swamid-1.0/nya-18_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-18.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOoHdLociEfQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALuqPVIVu+lej+2bTpk/uS49yNJHgVbKKkNM+xIyVXmaiggCf7PaAajlJcp3C/AQlJCPrV4FODCgprd6PLhY2UECAwEAAaN/MH0wHQYDVR0OBBYEFJloM666Z1IlsDZMLRpD807gg1HgME4GA1UdIwRHMEWAFJloM666Z1IlsDZMLRpD807gg1HgoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA6gd0uhyIR9AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKHwjxQjgsIiGkGKh+Vtjp4srJIEACl8ZQfopqAGySuovZYV/ZdFmu04fhRaMtzHDLLTB1F6dOQZp6NCeuLedbI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-18.ladok.umu.se:8452/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://nya-18.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8452/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://nya-18.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOoHdLociEfQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALuqPVIVu+lej+2bTpk/uS49yNJHgVbKKkNM+xIyVXmaiggCf7PaAajlJcp3C/AQlJCPrV4FODCgprd6PLhY2UECAwEAAaN/MH0wHQYDVR0OBBYEFJloM666Z1IlsDZMLRpD807gg1HgME4GA1UdIwRHMEWAFJloM666Z1IlsDZMLRpD807gg1HgoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA6gd0uhyIR9AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKHwjxQjgsIiGkGKh+Vtjp4srJIEACl8ZQfopqAGySuovZYV/ZdFmu04fhRaMtzHDLLTB1F6dOQZp6NCeuLedbI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-18.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml
index 8644832e..b3ae0124 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp-en">
-
<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://nya-19.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ xT357BkGKeaFoFJIqXRGubefLB5rQw//6ijvOkT+qU05LfIn/DEv8aI6QClSUNpA
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml
index e430cd78..0cbe8a09 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
index cc6da638..9ca6263a 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/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://nya-19.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/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://nya-19.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml
index b19c9a1f..2c5b1277 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
index 15301457..9d244978 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/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://nya-19.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/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://nya-19.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-19_idp-metadata.xml b/swamid-1.0/nya-19_idp-metadata.xml
index 4834c75c..a7c8e21d 100644
--- a/swamid-1.0/nya-19_idp-metadata.xml
+++ b/swamid-1.0/nya-19_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-19.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKouruINQwf0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL34WFtl1f6VVwSvSFw0BtbEsLkBgXQgtNVO/glg6czCxBiQg5ZQGC5qQJP68K0dEBkGTanvk4yrdIzzarypMvkCAwEAAaN/MH0wHQYDVR0OBBYEFAe8cQCxX6qX4KG6QJODBBGATqo5ME4GA1UdIwRHMEWAFAe8cQCxX6qX4KG6QJODBBGATqo5oSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAqi6u4g1DB/QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFJB/xHAnvv1MchA0YQdHEdb+kjl84ADXX8mBRb0EM6G4jvs1s3DKR8W74hOBxwhpe2jm6mSyHm1q/Uv3c7Cick=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-19.ladok.umu.se:8452/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://nya-19.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8452/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://nya-19.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKouruINQwf0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL34WFtl1f6VVwSvSFw0BtbEsLkBgXQgtNVO/glg6czCxBiQg5ZQGC5qQJP68K0dEBkGTanvk4yrdIzzarypMvkCAwEAAaN/MH0wHQYDVR0OBBYEFAe8cQCxX6qX4KG6QJODBBGATqo5ME4GA1UdIwRHMEWAFAe8cQCxX6qX4KG6QJODBBGATqo5oSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAqi6u4g1DB/QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFJB/xHAnvv1MchA0YQdHEdb+kjl84ADXX8mBRb0EM6G4jvs1s3DKR8W74hOBxwhpe2jm6mSyHm1q/Uv3c7Cick=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-19.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml
index 68dc8db8..b0d2bcdb 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/aws-sp-en">
-
<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://nya-20.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ QzJR8qCTEcxD+K9MO9gWpVJMmNqg5IFOmzhYnV/rMIwFOvFYK95C2slC11Fu0mcx
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml
index 712d56e6..6abf91e1 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
index a5e1292c..ef5731a2 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/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://nya-20.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/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://nya-20.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml
index aa17b280..74c64c1b 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
index ce176487..bbc942ea 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/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://nya-20.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/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://nya-20.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-20_idp-metadata.xml b/swamid-1.0/nya-20_idp-metadata.xml
index ac971c23..e418e8ab 100644
--- a/swamid-1.0/nya-20_idp-metadata.xml
+++ b/swamid-1.0/nya-20_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-20.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK+ohF/z2a5AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAzaNR+GankctYomcEanMhsz0XcS0IVOtLiphC10Owft2lM21nzV+xpAhr6rp42aOWHvfUosBRPskfE/LmvqAsCAwEAAaN/MH0wHQYDVR0OBBYEFH1fsHDIvkhQL1kYJs8guY8eFPkrME4GA1UdIwRHMEWAFH1fsHDIvkhQL1kYJs8guY8eFPkroSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAr6iEX/PZrkAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHkXPAAgeLOgL1bQFU7Ya9hGTPz/ehDsmnIgqf1Nt4Xzbg+31QVEzgEDZQbE8qVaNvzC2HeRrkIqM3yFgP6XXAw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-20.ladok.umu.se:8452/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://nya-20.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8452/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://nya-20.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK+ohF/z2a5AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAzaNR+GankctYomcEanMhsz0XcS0IVOtLiphC10Owft2lM21nzV+xpAhr6rp42aOWHvfUosBRPskfE/LmvqAsCAwEAAaN/MH0wHQYDVR0OBBYEFH1fsHDIvkhQL1kYJs8guY8eFPkrME4GA1UdIwRHMEWAFH1fsHDIvkhQL1kYJs8guY8eFPkroSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAr6iEX/PZrkAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHkXPAAgeLOgL1bQFU7Ya9hGTPz/ehDsmnIgqf1Nt4Xzbg+31QVEzgEDZQbE8qVaNvzC2HeRrkIqM3yFgP6XXAw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-20.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml
index 73726eef..bd1b3ea5 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/aws-sp-en">
-
<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://nya-21.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ XLYyTIAvRplV3ElXVdONlh32PduBZoHIOo7pkXBcLxJAliuXukv4hPOgVAgiibmg
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml
index 1f2fa8e4..46eed8b6 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
index dbf8d7f8..c6935f08 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-21.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKDHezlRTa+MfK7ybE696Nf+vcwkUrkqOYjQNgSaTXb2AXEVZLO90IseTxZMOlxIqeCF9PuCP4W28Vk5RV/nG70CAwEAAaN/MH0wHQYDVR0OBBYEFJOfd1iwTcRnrcJxsGdlZNOmpAmuME4GA1UdIwRHMEWAFJOfd1iwTcRnrcJxsGdlZNOmpAmuoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkAk1HshxAoz5cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHxqpP/AqUt3ZIn4mT1/Rk1et+bek/k6hLbqosmdw05zXg+qWWy0VMvbxFkPfda+a+KYxU4R4bZTGb8LLplydZY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/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://nya-21.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/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://nya-21.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKDHezlRTa+MfK7ybE696Nf+vcwkUrkqOYjQNgSaTXb2AXEVZLO90IseTxZMOlxIqeCF9PuCP4W28Vk5RV/nG70CAwEAAaN/MH0wHQYDVR0OBBYEFJOfd1iwTcRnrcJxsGdlZNOmpAmuME4GA1UdIwRHMEWAFJOfd1iwTcRnrcJxsGdlZNOmpAmuoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkAk1HshxAoz5cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHxqpP/AqUt3ZIn4mT1/Rk1et+bek/k6hLbqosmdw05zXg+qWWy0VMvbxFkPfda+a+KYxU4R4bZTGb8LLplydZY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml
index 7f22d019..0f92d667 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
index 3a0885c9..995ac27e 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-21.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQ0b083Blgbrp/w8LjZqbVaXRFNhKFD6O4wVEddJOQFhndHpDkxd7s4fJjqkX5HoSsiRuF9q1jYEC6oXB3ewasCAwEAAaN/MH0wHQYDVR0OBBYEFLk4lnFr0YledzWBhr7RAnOU4ERVME4GA1UdIwRHMEWAFLk4lnFr0YledzWBhr7RAnOU4ERVoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA5z9VLyypzA0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA9fR2rcfPQf2Md9+lNRMxlVhz8nLvVPZRnXW2DW12vpt4J7W4heWZdXBNMc6qbthHOZ+OMk0desbx2tte35qb4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/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://nya-21.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/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://nya-21.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQ0b083Blgbrp/w8LjZqbVaXRFNhKFD6O4wVEddJOQFhndHpDkxd7s4fJjqkX5HoSsiRuF9q1jYEC6oXB3ewasCAwEAAaN/MH0wHQYDVR0OBBYEFLk4lnFr0YledzWBhr7RAnOU4ERVME4GA1UdIwRHMEWAFLk4lnFr0YledzWBhr7RAnOU4ERVoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA5z9VLyypzA0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA9fR2rcfPQf2Md9+lNRMxlVhz8nLvVPZRnXW2DW12vpt4J7W4heWZdXBNMc6qbthHOZ+OMk0desbx2tte35qb4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-21_idp-metadata.xml b/swamid-1.0/nya-21_idp-metadata.xml
index df253d18..ee030233 100644
--- a/swamid-1.0/nya-21_idp-metadata.xml
+++ b/swamid-1.0/nya-21_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-21.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-21.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANkmbpYTIXRMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALv9adRuGom25kRbs0JWupzhJEUYtpz8MgXpG7O6CqxmlLA3gSZWs5lYYIIc+9WdMPzRRmwZMlSDu8+3NnZ6jLUCAwEAAaN/MH0wHQYDVR0OBBYEFAAYj4HLbXnWXUQXSqmWxu4Hi91xME4GA1UdIwRHMEWAFAAYj4HLbXnWXUQXSqmWxu4Hi91xoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA2SZulhMhdEwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADLU5FACpYtm1OhLmqSAj4iEmdTgzOQcsX7hZgtekW+isQ23lXF61UM+tnRLqdwiSwTb8DkFkMqbxoKlQLbG0pk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-21.ladok.umu.se:8452/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://nya-21.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8452/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://nya-21.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANkmbpYTIXRMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALv9adRuGom25kRbs0JWupzhJEUYtpz8MgXpG7O6CqxmlLA3gSZWs5lYYIIc+9WdMPzRRmwZMlSDu8+3NnZ6jLUCAwEAAaN/MH0wHQYDVR0OBBYEFAAYj4HLbXnWXUQXSqmWxu4Hi91xME4GA1UdIwRHMEWAFAAYj4HLbXnWXUQXSqmWxu4Hi91xoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA2SZulhMhdEwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADLU5FACpYtm1OhLmqSAj4iEmdTgzOQcsX7hZgtekW+isQ23lXF61UM+tnRLqdwiSwTb8DkFkMqbxoKlQLbG0pk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-21.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml
index 466959d3..38d36a24 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/aws-sp-en">
-
<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://nya-22.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ZXlCO/zyPmju1bjLPNqeiNWRiBXj10LMH3e96gPcHrU82Lt9/nhfs2eq/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml
index 694ac131..20437a0d 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ NioMjs/wGzv5NqI/lvVaTI3ZibsONLAm95E2YsAozUmXpf49XE630Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
index a0d53ab4..3672b473 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-22.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKfkXD1Z7YURYCacXGiEwURSzxMns2ws+3/0duOfQ2u93kmNFxi8uX1RKZGFVQunJofc7MsC2vg9EgCXpjC+HEcCAwEAAaN/MH0wHQYDVR0OBBYEFINQ06+tab0DHHeHON4cbpom5jjjME4GA1UdIwRHMEWAFINQ06+tab0DHHeHON4cbpom5jjjoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAznwLEvlFT8owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFDeZ1zw6rmpoB72DIx8d9tUlJToEcvuNBkrwaHNkAxHUN1VZtUgE2NHuQ6bBx8E3nml5+7VMoiHtaB7z7G8aMw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/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://nya-22.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/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://nya-22.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKfkXD1Z7YURYCacXGiEwURSzxMns2ws+3/0duOfQ2u93kmNFxi8uX1RKZGFVQunJofc7MsC2vg9EgCXpjC+HEcCAwEAAaN/MH0wHQYDVR0OBBYEFINQ06+tab0DHHeHON4cbpom5jjjME4GA1UdIwRHMEWAFINQ06+tab0DHHeHON4cbpom5jjjoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAznwLEvlFT8owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFDeZ1zw6rmpoB72DIx8d9tUlJToEcvuNBkrwaHNkAxHUN1VZtUgE2NHuQ6bBx8E3nml5+7VMoiHtaB7z7G8aMw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml
index 78157379..d2813898 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ ANjqu5Nik7dmEdQabHioZWmiBHz7BIxsVeBq4knZsD8xIapdJcMQUw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
index 8d96b129..8f22e6dc 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-22.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANtWeRGcKBmwSJxCA2mZ/dfcFazEB4Y4Jv3KFiMkR4FF9mUZ3S9+0nAjQMLIEGKly0ynGSK4VKWwTR3BWkhUJxECAwEAAaN/MH0wHQYDVR0OBBYEFKcj7IvlZXoq0b0b7H+ohVc37skMME4GA1UdIwRHMEWAFKcj7IvlZXoq0b0b7H+ohVc37skMoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAhQZICpVe8ZIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKhnsKi2vSdPeTu5W8BzWl708Ztb7F2HJMKsPAVpHk9KAhqtqyi/GIxMBQxDGTWrs2Jy6RJnwF1ECEXZLNkz9GM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/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://nya-22.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/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://nya-22.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANtWeRGcKBmwSJxCA2mZ/dfcFazEB4Y4Jv3KFiMkR4FF9mUZ3S9+0nAjQMLIEGKly0ynGSK4VKWwTR3BWkhUJxECAwEAAaN/MH0wHQYDVR0OBBYEFKcj7IvlZXoq0b0b7H+ohVc37skMME4GA1UdIwRHMEWAFKcj7IvlZXoq0b0b7H+ohVc37skMoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAhQZICpVe8ZIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKhnsKi2vSdPeTu5W8BzWl708Ztb7F2HJMKsPAVpHk9KAhqtqyi/GIxMBQxDGTWrs2Jy6RJnwF1ECEXZLNkz9GM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-22_idp-metadata.xml b/swamid-1.0/nya-22_idp-metadata.xml
index ef83e33a..9de23812 100644
--- a/swamid-1.0/nya-22_idp-metadata.xml
+++ b/swamid-1.0/nya-22_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-22.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-22.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIk2rW7DH6fVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOChsz8bfCpSVmntsAVfFtJhMcM/pMsEwf07bQUpAAtRiM8W0VrvWkgibn7zEc9oFjcgoTFvOxrejxRp+Z2dLjECAwEAAaN/MH0wHQYDVR0OBBYEFCQIzhcwTc3IAa/Re2HZXAQZ148DME4GA1UdIwRHMEWAFCQIzhcwTc3IAa/Re2HZXAQZ148DoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAiTatbsMfp9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0wCaL7J4iCdYF7Wlg0OBZUW3vt4P091QvfSMaQdDPKqvWgy2MxjGLj718+kLsRdQYEW2qV2a2ojc3cEoko1yQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-22.ladok.umu.se:8452/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://nya-22.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8452/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://nya-22.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIk2rW7DH6fVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOChsz8bfCpSVmntsAVfFtJhMcM/pMsEwf07bQUpAAtRiM8W0VrvWkgibn7zEc9oFjcgoTFvOxrejxRp+Z2dLjECAwEAAaN/MH0wHQYDVR0OBBYEFCQIzhcwTc3IAa/Re2HZXAQZ148DME4GA1UdIwRHMEWAFCQIzhcwTc3IAa/Re2HZXAQZ148DoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAiTatbsMfp9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0wCaL7J4iCdYF7Wlg0OBZUW3vt4P091QvfSMaQdDPKqvWgy2MxjGLj718+kLsRdQYEW2qV2a2ojc3cEoko1yQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-22.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml
index a44a3ae9..20ec6e3e 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/aws-sp-en">
-
<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://nya-23.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ dA2i9sB0Cu8nKmw37PqM4mtcq371DdengqXWAtXbhTPmCRItJOIbSxBBBQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml
index 27e34311..4cc25cc3 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
index b92e8add..6d80c904 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-23.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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://nya-23.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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://nya-23.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml
index f2b5147e..1c463c84 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ D/EHQd/XrAoj/qoPpTKzeS9rHX+poV1qaWJtTyCLsNx/hj2QaO4fAADyAhoSp5qI
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
index 0d4ef41a..7dad989f 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-23.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN/PvmIePjKFW6Va6I6eK+XxVIXdykJe+GY9l3PTOIALhUb4ir92jWlGQYXpXTh/+WqJGwfoPL+5mdq3WK7lKt8CAwEAAaN/MH0wHQYDVR0OBBYEFCWiF7BkM/zs86okl98WdQsWe6I2ME4GA1UdIwRHMEWAFCWiF7BkM/zs86okl98WdQsWe6I2oSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkApAH/b7WwapowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAx8AB7lnuhRQEImiTj99mnA8qBVbCRxEh6WVG4vURf2jUQmUpn6CarLuPeCh/KTpAEcVxVFo+GLyhn5e+gt6Lc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/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://nya-23.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/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://nya-23.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN/PvmIePjKFW6Va6I6eK+XxVIXdykJe+GY9l3PTOIALhUb4ir92jWlGQYXpXTh/+WqJGwfoPL+5mdq3WK7lKt8CAwEAAaN/MH0wHQYDVR0OBBYEFCWiF7BkM/zs86okl98WdQsWe6I2ME4GA1UdIwRHMEWAFCWiF7BkM/zs86okl98WdQsWe6I2oSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkApAH/b7WwapowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAx8AB7lnuhRQEImiTj99mnA8qBVbCRxEh6WVG4vURf2jUQmUpn6CarLuPeCh/KTpAEcVxVFo+GLyhn5e+gt6Lc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-23_idp-metadata.xml b/swamid-1.0/nya-23_idp-metadata.xml
index f762f629..32ea3281 100644
--- a/swamid-1.0/nya-23_idp-metadata.xml
+++ b/swamid-1.0/nya-23_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-23.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-23.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIT2fjtlyuzxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMOtaEKqwkQ+O8gH0gCT5ri8QtNi8pP274y3Np7j+ZIJ2x3PZ8Mau6TwjZ50Z4xOHtmidVF5ENHwDdSX5A6gp50CAwEAAaN/MH0wHQYDVR0OBBYEFJfrcAF1+EujdwiIW/ab5s61Yq+xME4GA1UdIwRHMEWAFJfrcAF1+EujdwiIW/ab5s61Yq+xoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkAhPZ+O2XK7PEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzTy+lLUIwL8WHo/Y0vwvMuPSMLMh7oj0Lg9FuIVkTuUyPAXIsR0x+83e098Dfogcbjkt/kxAORMIM9oSR5nyc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-23.ladok.umu.se:8452/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://nya-23.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8452/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://nya-23.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIT2fjtlyuzxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMOtaEKqwkQ+O8gH0gCT5ri8QtNi8pP274y3Np7j+ZIJ2x3PZ8Mau6TwjZ50Z4xOHtmidVF5ENHwDdSX5A6gp50CAwEAAaN/MH0wHQYDVR0OBBYEFJfrcAF1+EujdwiIW/ab5s61Yq+xME4GA1UdIwRHMEWAFJfrcAF1+EujdwiIW/ab5s61Yq+xoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkAhPZ+O2XK7PEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzTy+lLUIwL8WHo/Y0vwvMuPSMLMh7oj0Lg9FuIVkTuUyPAXIsR0x+83e098Dfogcbjkt/kxAORMIM9oSR5nyc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-23.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml
index 1ef98d60..89a5ca03 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/aws-sp-en">
-
<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://nya-24.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ XxRTKJAXoCeGHHQD+bGqDsG3+iKhlZ5E/41a9eg9fKjOObb6BI2EVIwtk7InVR+L
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml
index ba3b76ef..b6a19173 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ pN+aHLN+CCLWIwcveWDJkn3GF7UN6H2hos6GvtnwrkLw7VNasMM/iw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
index cfc814ed..74abbb77 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-24.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXWMsS5is4X6dCQciuul6t+PBdpkHGETmeDH9NAe0ZkoZ+6VDCMZ/F0IL+NrtxZEK02doazRGm0gkRU2HOPJPcCAwEAAaN/MH0wHQYDVR0OBBYEFJCB24n8pOVO/RjtgbnPR/lB41SBME4GA1UdIwRHMEWAFJCB24n8pOVO/RjtgbnPR/lB41SBoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAkGWj3fU7SQMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJIfkPpRX01NMt+zeWez/cNcltWjcJSo9huh7Okd2P9N4gqpNwhydtpKMUtfNz3reeXrQ1vESbrdUAJl7CPrWNE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/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://nya-24.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/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://nya-24.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXWMsS5is4X6dCQciuul6t+PBdpkHGETmeDH9NAe0ZkoZ+6VDCMZ/F0IL+NrtxZEK02doazRGm0gkRU2HOPJPcCAwEAAaN/MH0wHQYDVR0OBBYEFJCB24n8pOVO/RjtgbnPR/lB41SBME4GA1UdIwRHMEWAFJCB24n8pOVO/RjtgbnPR/lB41SBoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAkGWj3fU7SQMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJIfkPpRX01NMt+zeWez/cNcltWjcJSo9huh7Okd2P9N4gqpNwhydtpKMUtfNz3reeXrQ1vESbrdUAJl7CPrWNE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml
index ec268f21..e1bee9b6 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
index 89b1de8e..f301015e 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-24.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEqEGh6Sg9lfhIQPNowivKjqnD0BRc9Dz5THbunWl9EfN3BCUU4CJjPnSsf4HzS04GL1IPV/EyZkETvRQxaB5MCAwEAAaN/MH0wHQYDVR0OBBYEFA5WEJDvVkGd9qY/JMJk0ORtkmTeME4GA1UdIwRHMEWAFA5WEJDvVkGd9qY/JMJk0ORtkmTeoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAhhrQP+6+7VUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEvuBQiZh7Ln/N5iWYHRwLB7mXbw+OFsY7YLlACxc5D/siX7NrD4XSIzUB0hJUtxuCh28ddOOV+RBHQU3pgYj1w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/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://nya-24.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/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://nya-24.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEqEGh6Sg9lfhIQPNowivKjqnD0BRc9Dz5THbunWl9EfN3BCUU4CJjPnSsf4HzS04GL1IPV/EyZkETvRQxaB5MCAwEAAaN/MH0wHQYDVR0OBBYEFA5WEJDvVkGd9qY/JMJk0ORtkmTeME4GA1UdIwRHMEWAFA5WEJDvVkGd9qY/JMJk0ORtkmTeoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAhhrQP+6+7VUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEvuBQiZh7Ln/N5iWYHRwLB7mXbw+OFsY7YLlACxc5D/siX7NrD4XSIzUB0hJUtxuCh28ddOOV+RBHQU3pgYj1w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-24_idp-metadata.xml b/swamid-1.0/nya-24_idp-metadata.xml
index 840caf4b..22a5dc6e 100644
--- a/swamid-1.0/nya-24_idp-metadata.xml
+++ b/swamid-1.0/nya-24_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-24.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-24.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO3P44qBWFzaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANKSPH1NhVtLyPH2ZdaNQZ17FylWWfni3PQQpx064CWlc5RdbstpW5ZP4T8Fk82xn16yEM3XWkNBdqNdnNLXpvsCAwEAAaN/MH0wHQYDVR0OBBYEFETl4Ug3EYGmrMSUCHupgZwGDf5UME4GA1UdIwRHMEWAFETl4Ug3EYGmrMSUCHupgZwGDf5UoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkA7c/jioFYXNowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzY70xJmP2zNqBqOR9KjQiszw37vDdmriTt0JGQvRi7R9/Fnia+exUrWvw+kP4SrUFpsYTbvHoFOiMBheYBJDs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-24.ladok.umu.se:8452/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://nya-24.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8452/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://nya-24.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO3P44qBWFzaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANKSPH1NhVtLyPH2ZdaNQZ17FylWWfni3PQQpx064CWlc5RdbstpW5ZP4T8Fk82xn16yEM3XWkNBdqNdnNLXpvsCAwEAAaN/MH0wHQYDVR0OBBYEFETl4Ug3EYGmrMSUCHupgZwGDf5UME4GA1UdIwRHMEWAFETl4Ug3EYGmrMSUCHupgZwGDf5UoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkA7c/jioFYXNowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzY70xJmP2zNqBqOR9KjQiszw37vDdmriTt0JGQvRi7R9/Fnia+exUrWvw+kP4SrUFpsYTbvHoFOiMBheYBJDs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-24.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml
index 7bc814e4..b05db47f 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/aws-sp-en">
-
<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://nya-25.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ NRj6t/LuaLUR1y8KVvU3wbgIIlWGQfVzOleB/hm52MlKne52F0E4+11OGg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml
index 613be0e1..016ac579 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
index e77b8b88..1deb921b 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-25.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALWn6WCArMQJhfduLd/uW1MPPxY6vMFeBLXWKKz7XtnJf87ZiiORcB+y0FzamFU0789i1CpoINf+YRG88xPK9lECAwEAAaN/MH0wHQYDVR0OBBYEFI1Uxf3NMwsjkdXFSpo7hjPR1asBME4GA1UdIwRHMEWAFI1Uxf3NMwsjkdXFSpo7hjPR1asBoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkArtzybLmmH6gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHvGsE/AO9v+C43wylKpRFHMYl1L5JrKLepsxM9A2bj2FcXo8g1poBqAiQ1T58IkQpYrmKUZYEBefkkow5rWGo8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/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://nya-25.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/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://nya-25.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALWn6WCArMQJhfduLd/uW1MPPxY6vMFeBLXWKKz7XtnJf87ZiiORcB+y0FzamFU0789i1CpoINf+YRG88xPK9lECAwEAAaN/MH0wHQYDVR0OBBYEFI1Uxf3NMwsjkdXFSpo7hjPR1asBME4GA1UdIwRHMEWAFI1Uxf3NMwsjkdXFSpo7hjPR1asBoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkArtzybLmmH6gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHvGsE/AO9v+C43wylKpRFHMYl1L5JrKLepsxM9A2bj2FcXo8g1poBqAiQ1T58IkQpYrmKUZYEBefkkow5rWGo8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml
index 76d5bebc..3d2ed26d 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ BwTfEfdEuaZ8Qw506JRGKv9VbiefYZ9Tv57lD5mq7h4AIus5MiGNLQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
index 2ce38a2c..e0e39507 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-25.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ0WhcNMjEwMjI3MTYyODQ0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALRqVYZb+AO+i0F6wLlZHlCsa+umtgklRNIdnL0QAYbM43D9iADkxAxzpFsPC6ZjHcy6558ais/mNCXfGtGcVRECAwEAAaN/MH0wHQYDVR0OBBYEFNBCF+sf0xRGPoa0nvej/sz9OG6bME4GA1UdIwRHMEWAFNBCF+sf0xRGPoa0nvej/sz9OG6boSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA+Y9bCFkGvlswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJKJpOrx90DSEFuzxrz5JgBZWU9FmwlIX1xs0Wptkwf7hpjFXvAAdnrU1YWHf5SWyQucVDqCAYT8BQLB0yujc+s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/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://nya-25.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/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://nya-25.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ0WhcNMjEwMjI3MTYyODQ0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALRqVYZb+AO+i0F6wLlZHlCsa+umtgklRNIdnL0QAYbM43D9iADkxAxzpFsPC6ZjHcy6558ais/mNCXfGtGcVRECAwEAAaN/MH0wHQYDVR0OBBYEFNBCF+sf0xRGPoa0nvej/sz9OG6bME4GA1UdIwRHMEWAFNBCF+sf0xRGPoa0nvej/sz9OG6boSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA+Y9bCFkGvlswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJKJpOrx90DSEFuzxrz5JgBZWU9FmwlIX1xs0Wptkwf7hpjFXvAAdnrU1YWHf5SWyQucVDqCAYT8BQLB0yujc+s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-25_idp-metadata.xml b/swamid-1.0/nya-25_idp-metadata.xml
index 86c911f1..53c1ca2a 100644
--- a/swamid-1.0/nya-25_idp-metadata.xml
+++ b/swamid-1.0/nya-25_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-25.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-25.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPVoZrBJp4/NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/BV6cMQViERQL456XNFBK8JPSuvkYmrdMEquSKsSlZ1fojjQT0H8fUl08VqpV+Bq2CUH/EC//Et9mFVuIrJh8CAwEAAaN/MH0wHQYDVR0OBBYEFEZqeESVjNkClhdI6Mpgb6hu8mQAME4GA1UdIwRHMEWAFEZqeESVjNkClhdI6Mpgb6hu8mQAoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA9WhmsEmnj80wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIPxzdEtwIRoznueoVXIFE8p/SkNq/KE4EfYSfXDJkvnr0C3k5I6JlpYSkGtQb0aFSzAfr2PeiFm1HxOxwl/aKc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-25.ladok.umu.se:8452/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://nya-25.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8452/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://nya-25.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPVoZrBJp4/NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/BV6cMQViERQL456XNFBK8JPSuvkYmrdMEquSKsSlZ1fojjQT0H8fUl08VqpV+Bq2CUH/EC//Et9mFVuIrJh8CAwEAAaN/MH0wHQYDVR0OBBYEFEZqeESVjNkClhdI6Mpgb6hu8mQAME4GA1UdIwRHMEWAFEZqeESVjNkClhdI6Mpgb6hu8mQAoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA9WhmsEmnj80wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIPxzdEtwIRoznueoVXIFE8p/SkNq/KE4EfYSfXDJkvnr0C3k5I6JlpYSkGtQb0aFSzAfr2PeiFm1HxOxwl/aKc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-25.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml
index 25036eb2..49a81b31 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/aws-sp-en">
-
<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://nya-26.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ EN4xy84V9WE+bDj8Xp32IHk94hqWVgyHdCSTn37MxRLuMwE/Nof5YXRdSg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml
index 00eff4c1..a672c28d 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
index 95c4d5db..c766aed7 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-26.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO4hpA262RckfWkz2d90dqhIXmMrC9dGS+Sc0uABbWIOGUmAgGK8NA95N0fs1aIeRQm4lq3uI/TtVpyJL6y7kJkCAwEAAaN/MH0wHQYDVR0OBBYEFBX5OAmlsWbotOOwEjLCZh/04ziIME4GA1UdIwRHMEWAFBX5OAmlsWbotOOwEjLCZh/04ziIoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAmuMWw/ZSWkQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUXiG3pdRurQu+NHg5belX8wMno8A+TUEkxvENQYK5H0+OApYPJYXyO/KX4oEnpZSGwC0A+B40agW+OkwQEgOk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/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://nya-26.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/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://nya-26.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO4hpA262RckfWkz2d90dqhIXmMrC9dGS+Sc0uABbWIOGUmAgGK8NA95N0fs1aIeRQm4lq3uI/TtVpyJL6y7kJkCAwEAAaN/MH0wHQYDVR0OBBYEFBX5OAmlsWbotOOwEjLCZh/04ziIME4GA1UdIwRHMEWAFBX5OAmlsWbotOOwEjLCZh/04ziIoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAmuMWw/ZSWkQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUXiG3pdRurQu+NHg5belX8wMno8A+TUEkxvENQYK5H0+OApYPJYXyO/KX4oEnpZSGwC0A+B40agW+OkwQEgOk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml
index 39019f4a..176bdb3e 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
index d265a2fb..3cf0584b 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-26.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ3WhcNMjEwMjI3MTYyODQ3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8VHy0CbGSb2QnE26Ztpkb8ZDnM9VlWC3vblii0+WsA8YGG8go2T3lk6qIizBiGE0SGykUskuujUeRsN0iMvN0CAwEAAaN/MH0wHQYDVR0OBBYEFOFFdextZDqDy1Pg0ivtW273SypqME4GA1UdIwRHMEWAFOFFdextZDqDy1Pg0ivtW273SypqoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAzht7NXYim7MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA2jhEZ51yTjR5IXOgAI4Gyi6Mp58wd0aBLOCYtCiuCYPkt1YkkjHmDypBS59gwhsKsCuBFhwv9bOHEvtiNQ37g=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/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://nya-26.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/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://nya-26.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ3WhcNMjEwMjI3MTYyODQ3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8VHy0CbGSb2QnE26Ztpkb8ZDnM9VlWC3vblii0+WsA8YGG8go2T3lk6qIizBiGE0SGykUskuujUeRsN0iMvN0CAwEAAaN/MH0wHQYDVR0OBBYEFOFFdextZDqDy1Pg0ivtW273SypqME4GA1UdIwRHMEWAFOFFdextZDqDy1Pg0ivtW273SypqoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAzht7NXYim7MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA2jhEZ51yTjR5IXOgAI4Gyi6Mp58wd0aBLOCYtCiuCYPkt1YkkjHmDypBS59gwhsKsCuBFhwv9bOHEvtiNQ37g=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-26_idp-metadata.xml b/swamid-1.0/nya-26_idp-metadata.xml
index c8047bff..97ae5712 100644
--- a/swamid-1.0/nya-26_idp-metadata.xml
+++ b/swamid-1.0/nya-26_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-26.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-26.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALIodwWlcbtrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2HW4IkbgdC4U7/yvKtMzRlyXzTvIca7AG28YkjBfzpbu3PwD3+/dARQCHXcxgTTYkYnaFmJtLxTx++sz41lDcCAwEAAaN/MH0wHQYDVR0OBBYEFJfRBr2HdPlaqxQjK8CG20hS8RTLME4GA1UdIwRHMEWAFJfRBr2HdPlaqxQjK8CG20hS8RTLoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAsih3BaVxu2swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEoME8x05cIOFRjKag4PBodOUU9eGUXlZvRnTaldZklVaZ4CFYkpRtlzt2Yl7mSZPKLA1omU07s8h7hd8Cx0qnk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-26.ladok.umu.se:8452/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://nya-26.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8452/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://nya-26.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALIodwWlcbtrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2HW4IkbgdC4U7/yvKtMzRlyXzTvIca7AG28YkjBfzpbu3PwD3+/dARQCHXcxgTTYkYnaFmJtLxTx++sz41lDcCAwEAAaN/MH0wHQYDVR0OBBYEFJfRBr2HdPlaqxQjK8CG20hS8RTLME4GA1UdIwRHMEWAFJfRBr2HdPlaqxQjK8CG20hS8RTLoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAsih3BaVxu2swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEoME8x05cIOFRjKag4PBodOUU9eGUXlZvRnTaldZklVaZ4CFYkpRtlzt2Yl7mSZPKLA1omU07s8h7hd8Cx0qnk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-26.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml
index 916e6fa2..a6a12be3 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/aws-sp-en">
-
<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://nya-27.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ w/LR6BjPRnidomTdbMUJtuZ2Vy9f/A2PX8xz1VnJ1FwMsYZ04t7tL//jww==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml
index 4faa0a55..03f8a876 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ UMYlJQdprstMpBqDZw7DmjrPz62SbdnakbXUfAg0x6uOXlVtcv0iOQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
index 4bba4d0b..621891b4 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-27.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQZjG87MJxX/u39xd3ntIf+Kbw1HnwedEQtrEXBGvY+QUxrVvb9lU3NwXJg68NyjyLAZUozZ/ctRGe59Ao6Y6kCAwEAAaN/MH0wHQYDVR0OBBYEFHK1spBTknKBFa1BEnuP/vAFJBHcME4GA1UdIwRHMEWAFHK1spBTknKBFa1BEnuP/vAFJBHcoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkA1gjtfLhvs6IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC/cJyvjSAZAQwq9XhuR8oEH2EzFJJUxAtXhG99q7tS5TzaPWduAcoeLDpz7LUP1BcsfbyM8C3eVLNAUPtNF5eU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/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://nya-27.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/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://nya-27.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQZjG87MJxX/u39xd3ntIf+Kbw1HnwedEQtrEXBGvY+QUxrVvb9lU3NwXJg68NyjyLAZUozZ/ctRGe59Ao6Y6kCAwEAAaN/MH0wHQYDVR0OBBYEFHK1spBTknKBFa1BEnuP/vAFJBHcME4GA1UdIwRHMEWAFHK1spBTknKBFa1BEnuP/vAFJBHcoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkA1gjtfLhvs6IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC/cJyvjSAZAQwq9XhuR8oEH2EzFJJUxAtXhG99q7tS5TzaPWduAcoeLDpz7LUP1BcsfbyM8C3eVLNAUPtNF5eU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml
index 4e3ca013..7195e058 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ MhVUSmaP3/KoWvbJ1UJ/pPl9RGufT50br0mnYMGI+bjUX2c8JJbzlg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
index 16730408..f7cc99e5 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-27.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANGJ01J22ZKMxFpcn8AxCnvIOA1BRt+usGNqXf9Z5KkndgpcfeHtIx+njay2nQ7Kc3v7+lxnj4OVq3sjgAFNNDUCAwEAAaN/MH0wHQYDVR0OBBYEFHYKFgvxlwh1LE8qbeU4n6mO+54OME4GA1UdIwRHMEWAFHYKFgvxlwh1LE8qbeU4n6mO+54OoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAvncyDC5Ud5UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJiWafcW56v6YB4nVrYA7l7W9z3oQVriCrleQVeRPZeBJf5niFe9Mwa/2R/zv5C4NebIQN7Pb6oLR15qCfe3tvU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/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://nya-27.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/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://nya-27.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANGJ01J22ZKMxFpcn8AxCnvIOA1BRt+usGNqXf9Z5KkndgpcfeHtIx+njay2nQ7Kc3v7+lxnj4OVq3sjgAFNNDUCAwEAAaN/MH0wHQYDVR0OBBYEFHYKFgvxlwh1LE8qbeU4n6mO+54OME4GA1UdIwRHMEWAFHYKFgvxlwh1LE8qbeU4n6mO+54OoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAvncyDC5Ud5UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJiWafcW56v6YB4nVrYA7l7W9z3oQVriCrleQVeRPZeBJf5niFe9Mwa/2R/zv5C4NebIQN7Pb6oLR15qCfe3tvU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-27_idp-metadata.xml b/swamid-1.0/nya-27_idp-metadata.xml
index 62a11ed3..f68ce447 100644
--- a/swamid-1.0/nya-27_idp-metadata.xml
+++ b/swamid-1.0/nya-27_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-27.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-27.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAINV/iQSKFgUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJbUABs7+6wYvQFpBmJRTFaOHV107KtTiZw70DNoKqvFZpGiV3S9xScZqfMCETTehtNuER4c3bqZkVO27ktO3+sCAwEAAaN/MH0wHQYDVR0OBBYEFKcAy1Hd7uOIoANnC1OHj8P7GmHgME4GA1UdIwRHMEWAFKcAy1Hd7uOIoANnC1OHj8P7GmHgoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAg1X+JBIoWBQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABwrUOgg9pOMvvrk3PYNxe9ZUu4sp1aUtrpYYO5ND7ZGYmpJBwFWcpfN7XuXe/fLfckzIEoZQeQOGHUufP+hm2s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-27.ladok.umu.se:8452/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://nya-27.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8452/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://nya-27.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAINV/iQSKFgUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJbUABs7+6wYvQFpBmJRTFaOHV107KtTiZw70DNoKqvFZpGiV3S9xScZqfMCETTehtNuER4c3bqZkVO27ktO3+sCAwEAAaN/MH0wHQYDVR0OBBYEFKcAy1Hd7uOIoANnC1OHj8P7GmHgME4GA1UdIwRHMEWAFKcAy1Hd7uOIoANnC1OHj8P7GmHgoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAg1X+JBIoWBQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABwrUOgg9pOMvvrk3PYNxe9ZUu4sp1aUtrpYYO5ND7ZGYmpJBwFWcpfN7XuXe/fLfckzIEoZQeQOGHUufP+hm2s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-27.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml
index a7dd07f9..7af09549 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/aws-sp-en">
-
<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://nya-28.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Qiai6+3vTnVpY6vPb2GpmZ7Vg9i1p0h53YQTT3K19AcNoEERaWmyT2HkhbezB6Dk
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml
index cc19f47f..f6cab3af 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
index e86aff49..7572d351 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-28.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK/Wxf7Jo4FhF1A/yIRPnLUoLHXMWFGO+4Zo6kreju+oJUwb86eoc/NvnRrmWdsvqmBxHVTssm6FxyhIIymx3fcCAwEAAaN/MH0wHQYDVR0OBBYEFA5ZAM53TrIy2YNBE8kg9ndGMOy4ME4GA1UdIwRHMEWAFA5ZAM53TrIy2YNBE8kg9ndGMOy4oSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAlHUOerMJlZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKCzFqiX53XaIapQhZS5xMzsaiIZJf4NzNL7/4i6WdFKnCYtpTYR/lQZwyked8IDO5IEggUulHXrPAMKcE270/E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/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://nya-28.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/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://nya-28.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK/Wxf7Jo4FhF1A/yIRPnLUoLHXMWFGO+4Zo6kreju+oJUwb86eoc/NvnRrmWdsvqmBxHVTssm6FxyhIIymx3fcCAwEAAaN/MH0wHQYDVR0OBBYEFA5ZAM53TrIy2YNBE8kg9ndGMOy4ME4GA1UdIwRHMEWAFA5ZAM53TrIy2YNBE8kg9ndGMOy4oSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAlHUOerMJlZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKCzFqiX53XaIapQhZS5xMzsaiIZJf4NzNL7/4i6WdFKnCYtpTYR/lQZwyked8IDO5IEggUulHXrPAMKcE270/E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml
index bee03ff2..c9937825 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ J/MEsrZ/KnERkfVq1Z6YyIU90KZCe496B5df6e70129rDGb1ZoMmDQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
index 33cd356a..9f6b7fe0 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-28.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU0WhcNMjEwMjI3MTYyODU0WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXP4usOfBZt3SjtplXarM3x3XKkls8GIEF6sAVfA8qbir3VaMm5H9zG+VF+Rk71C8rcAGdEWZWCKxaNf2tHTVUCAwEAAaN/MH0wHQYDVR0OBBYEFHdZbjHYDhYiKgRAt0Lolt0EqldiME4GA1UdIwRHMEWAFHdZbjHYDhYiKgRAt0Lolt0EqldioSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAsbwYJtspHe0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAATAH/DLKWu6OcYR1Ab/VtOAiKOqq1CGTVsmZ7sGNWIhtd0KuSnvSplWz2WYOXqtWoUjmSzBnxRFwTLKwjbZBic=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/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://nya-28.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/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://nya-28.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU0WhcNMjEwMjI3MTYyODU0WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXP4usOfBZt3SjtplXarM3x3XKkls8GIEF6sAVfA8qbir3VaMm5H9zG+VF+Rk71C8rcAGdEWZWCKxaNf2tHTVUCAwEAAaN/MH0wHQYDVR0OBBYEFHdZbjHYDhYiKgRAt0Lolt0EqldiME4GA1UdIwRHMEWAFHdZbjHYDhYiKgRAt0Lolt0EqldioSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAsbwYJtspHe0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAATAH/DLKWu6OcYR1Ab/VtOAiKOqq1CGTVsmZ7sGNWIhtd0KuSnvSplWz2WYOXqtWoUjmSzBnxRFwTLKwjbZBic=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-28_idp-metadata.xml b/swamid-1.0/nya-28_idp-metadata.xml
index f0a07cd9..a79d1a76 100644
--- a/swamid-1.0/nya-28_idp-metadata.xml
+++ b/swamid-1.0/nya-28_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-28.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-28.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANeJM4WjbeKQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALO0FY95nMVxjdro9sPe/3HTjFKKCYwz8Pw6yZz9NJ/zjKN4zX37K2HZ5/salsktOPer0YjHXh/g3wKHpWA6YMUCAwEAAaN/MH0wHQYDVR0OBBYEFJkpv5sTDi1X1X59yiW7qtMxdVUZME4GA1UdIwRHMEWAFJkpv5sTDi1X1X59yiW7qtMxdVUZoSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkA14kzhaNt4pAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHE3uOrqgdNkcX/een2kHpRpfTQJkZY/qcOp+/oEV21lB7JQEXIku1jIy87JJqN+jw+T48yq/ap6twaH6FaNwho=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-28.ladok.umu.se:8452/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://nya-28.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8452/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://nya-28.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANeJM4WjbeKQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALO0FY95nMVxjdro9sPe/3HTjFKKCYwz8Pw6yZz9NJ/zjKN4zX37K2HZ5/salsktOPer0YjHXh/g3wKHpWA6YMUCAwEAAaN/MH0wHQYDVR0OBBYEFJkpv5sTDi1X1X59yiW7qtMxdVUZME4GA1UdIwRHMEWAFJkpv5sTDi1X1X59yiW7qtMxdVUZoSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkA14kzhaNt4pAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHE3uOrqgdNkcX/een2kHpRpfTQJkZY/qcOp+/oEV21lB7JQEXIku1jIy87JJqN+jw+T48yq/ap6twaH6FaNwho=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-28.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml
index 75f9bddf..1805ce2b 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/aws-sp-en">
-
<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://nya-29.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ l765hiZbT7NqcTuv5FWmDtQwLICRUb3aVwf3EQTMjrR4DiN6JqA6l/tEpg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml
index 430c908c..0aaab64d 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ WSAr3hODRncOjSgwOPKYRYaEZeAmgmG22vRFZuPCz/rdEjRGMwPcMw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
index 19e99e18..e7807dbc 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-29.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANf4fWbt3EosFuu/5SM5xJDiAcwSPMLWy0harbjZhN++OlZm0u+iGtzeYn13dBHeZ+NkTHuii1mFzNy+NIqY18cCAwEAAaN/MH0wHQYDVR0OBBYEFI1CppVf49AQoQenMNq2u8NqfAGIME4GA1UdIwRHMEWAFI1CppVf49AQoQenMNq2u8NqfAGIoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkA5aGzRlyW/bEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM4l+PQsxKxx9BymFE0Ft18FfhqDRm+bWaHwQdpbgufANubggkhnHn41ri39OF9XaFVoNWGXUGMfCsXrY2stwrk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/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://nya-29.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/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://nya-29.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANf4fWbt3EosFuu/5SM5xJDiAcwSPMLWy0harbjZhN++OlZm0u+iGtzeYn13dBHeZ+NkTHuii1mFzNy+NIqY18cCAwEAAaN/MH0wHQYDVR0OBBYEFI1CppVf49AQoQenMNq2u8NqfAGIME4GA1UdIwRHMEWAFI1CppVf49AQoQenMNq2u8NqfAGIoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkA5aGzRlyW/bEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM4l+PQsxKxx9BymFE0Ft18FfhqDRm+bWaHwQdpbgufANubggkhnHn41ri39OF9XaFVoNWGXUGMfCsXrY2stwrk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml
index 5704cca5..98ae6b27 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ dPtbgXk/a3zwik/8RzmXndxF4O3D6ei/JpVhjCUj3fCXWjZzWq+4PQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
index 819e5a8f..a9848f38 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-29.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOzGfJ60TVWonxdzQ/0w8+Ej/GSK303yN/+COVEjHEW8HGO5XwrFIEHooGL++vbkRIa9zLcmuosZHh5qrmY8Ne0CAwEAAaN/MH0wHQYDVR0OBBYEFPl1wdmk4P+yu/723gUvIYSdE70tME4GA1UdIwRHMEWAFPl1wdmk4P+yu/723gUvIYSdE70toSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAz9D6Gsx7hEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIY0hfnUmZDxqR0JllYFQfACT+sx6y7QLDaukGVvvAdSvVJbCk9mJpLaWaIDTB4AfTk1Q1alWVHOvepCbVyjvFc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/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://nya-29.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/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://nya-29.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOzGfJ60TVWonxdzQ/0w8+Ej/GSK303yN/+COVEjHEW8HGO5XwrFIEHooGL++vbkRIa9zLcmuosZHh5qrmY8Ne0CAwEAAaN/MH0wHQYDVR0OBBYEFPl1wdmk4P+yu/723gUvIYSdE70tME4GA1UdIwRHMEWAFPl1wdmk4P+yu/723gUvIYSdE70toSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAz9D6Gsx7hEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIY0hfnUmZDxqR0JllYFQfACT+sx6y7QLDaukGVvvAdSvVJbCk9mJpLaWaIDTB4AfTk1Q1alWVHOvepCbVyjvFc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-29_idp-metadata.xml b/swamid-1.0/nya-29_idp-metadata.xml
index d3a64d5c..c6772b2b 100644
--- a/swamid-1.0/nya-29_idp-metadata.xml
+++ b/swamid-1.0/nya-29_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-29.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-29.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMSohvi8ADwhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ1+DIqlqlcO8cgg6K4h9KQcdAg6Q60egvibxnj+VOzwn3+1q46ije6xWfx7SFgWyKWa7vXRwUmetACryB6M7p0CAwEAAaN/MH0wHQYDVR0OBBYEFCRpSjASI88Ducg7vpQ1G1qaI7leME4GA1UdIwRHMEWAFCRpSjASI88Ducg7vpQ1G1qaI7leoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAxKiG+LwAPCEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADDO84xSWqg8KBpduEsAwX8rgGrc6csLAehsA2gbDIkZBQGOJUF0iD6Iuv2iF38hBdOPoXHylOI1L8yhQMuZu8E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-29.ladok.umu.se:8452/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://nya-29.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8452/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://nya-29.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMSohvi8ADwhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ1+DIqlqlcO8cgg6K4h9KQcdAg6Q60egvibxnj+VOzwn3+1q46ije6xWfx7SFgWyKWa7vXRwUmetACryB6M7p0CAwEAAaN/MH0wHQYDVR0OBBYEFCRpSjASI88Ducg7vpQ1G1qaI7leME4GA1UdIwRHMEWAFCRpSjASI88Ducg7vpQ1G1qaI7leoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAxKiG+LwAPCEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADDO84xSWqg8KBpduEsAwX8rgGrc6csLAehsA2gbDIkZBQGOJUF0iD6Iuv2iF38hBdOPoXHylOI1L8yhQMuZu8E=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-29.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml
index 11b0ffa0..0e4cb7ee 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/aws-sp-en">
-
<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://nya-30.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ zW4C2SOEz88i2AgLbCfKGbA2sBUOYdXmVlzUt6fhgA6SDSfZIYXM9ECOO48CqKOF
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml
index 6b5cd246..804a19ff 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
index 22a73df0..537d8b0d 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-30.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM36igm4DOMivZpWFyIX9cJ758aVMIt5Gt1600sDxiy+jqdJqVxAn6q7l0hs7yeOuv5KudBqo9RPKqmm8m33tnsCAwEAAaN/MH0wHQYDVR0OBBYEFKGhyw2EmFJeU01IHvvDGun3/2H0ME4GA1UdIwRHMEWAFKGhyw2EmFJeU01IHvvDGun3/2H0oSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA4AK1cqBuj3AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGCKsGmCULIdk1GzIERKT0BBR+lL2eQ9qaxi5nx6Yfv1Xu8vjWCjgTCq3grNbaxkzybEfTpq2T5CJ25+07eDA0U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/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://nya-30.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/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://nya-30.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM36igm4DOMivZpWFyIX9cJ758aVMIt5Gt1600sDxiy+jqdJqVxAn6q7l0hs7yeOuv5KudBqo9RPKqmm8m33tnsCAwEAAaN/MH0wHQYDVR0OBBYEFKGhyw2EmFJeU01IHvvDGun3/2H0ME4GA1UdIwRHMEWAFKGhyw2EmFJeU01IHvvDGun3/2H0oSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA4AK1cqBuj3AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGCKsGmCULIdk1GzIERKT0BBR+lL2eQ9qaxi5nx6Yfv1Xu8vjWCjgTCq3grNbaxkzybEfTpq2T5CJ25+07eDA0U=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml
index d87f883d..989c2995 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ eemU9AtLDw8r0Sd3K76LttVjQzUXSVN9jLvx7ahW2+mqbx3OWJFYfQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
index a25ef6c9..a40735f4 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-30.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJw37GcLrr0tqkrwK82PucThhXbMGny3b03QKRMC2NPxk9SFHo0cLFzG8WB9RaUbpy58yF7fLXn0XjD94IwogqsCAwEAAaN/MH0wHQYDVR0OBBYEFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtME4GA1UdIwRHMEWAFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkAiLkv4OzrUfswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABws5V3NQYoBnm6z6heIDrFWp59aLglcWMZPjzbKL7gNX8IetVL34mc+ESHm1ct//UXT0Ef0xGnPCgXSb3x6ixc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/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://nya-30.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/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://nya-30.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJw37GcLrr0tqkrwK82PucThhXbMGny3b03QKRMC2NPxk9SFHo0cLFzG8WB9RaUbpy58yF7fLXn0XjD94IwogqsCAwEAAaN/MH0wHQYDVR0OBBYEFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtME4GA1UdIwRHMEWAFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkAiLkv4OzrUfswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABws5V3NQYoBnm6z6heIDrFWp59aLglcWMZPjzbKL7gNX8IetVL34mc+ESHm1ct//UXT0Ef0xGnPCgXSb3x6ixc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/nya-30_idp-metadata.xml b/swamid-1.0/nya-30_idp-metadata.xml
index 0bba1591..dfa6db5c 100644
--- a/swamid-1.0/nya-30_idp-metadata.xml
+++ b/swamid-1.0/nya-30_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-30.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-30.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPqknqiLEb9gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANmHixMB2B/scudMaRwlDbOHU8HQT4J0I48/3rov70wO4DSSgHOBb0cWwR9CCXk1tTvSqYy0euy4VFpNtd2c6lECAwEAAaN/MH0wHQYDVR0OBBYEFBVmKvYmyD3REC57BXD07/1pj3TCME4GA1UdIwRHMEWAFBVmKvYmyD3REC57BXD07/1pj3TCoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA+qSeqIsRv2AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFsqSEwiKN92B4t8xE1Ac2mpIhNce8GxRjYB92QUzuVJUCo0YgbThHunAYnCgwYU42lfmavtziXEuHhs+IRY3hg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-30.ladok.umu.se:8452/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://nya-30.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8452/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://nya-30.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPqknqiLEb9gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANmHixMB2B/scudMaRwlDbOHU8HQT4J0I48/3rov70wO4DSSgHOBb0cWwR9CCXk1tTvSqYy0euy4VFpNtd2c6lECAwEAAaN/MH0wHQYDVR0OBBYEFBVmKvYmyD3REC57BXD07/1pj3TCME4GA1UdIwRHMEWAFBVmKvYmyD3REC57BXD07/1pj3TCoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA+qSeqIsRv2AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFsqSEwiKN92B4t8xE1Ac2mpIhNce8GxRjYB92QUzuVJUCo0YgbThHunAYnCgwYU42lfmavtziXEuHhs+IRY3hg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-30.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml
index 404b76ea..66c9148d 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.ladok.umu.se/aws-sp-en">
-
<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://nya-31.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ bFjcNEEWynDyWSL+AUkSJqRpqU/2PU1bo2zj/jAY23UhpytGyKzLJ37EcA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml
index ca755736..061afb18 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.ladok.umu.se/aws-sp">
-
<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://nya-31.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ eSuhc4ni/xBH6cv/RIyt81eqFoj216n2KBlREVNbCYGYSIxwSuEpcA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml
index 2fae15b0..0ac3af55 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-31.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-31.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL+FAivz13wLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ2WhcNMjEwODIwMTM0NjQ2WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALp5DV6Fu4Cat4s7g1LUE+PmQUsi83SlqhBMYHPVeYpUpCq7STPKqVHuNV083mOPHBJ73E1PVjjRf/0Jyg1yx6ECAwEAAaN/MH0wHQYDVR0OBBYEFG26WgTyYuTGeoxhLr/hx/H3xHkPME4GA1UdIwRHMEWAFG26WgTyYuTGeoxhLr/hx/H3xHkPoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAv4UCK/PXfAswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT+SzALKcgJx65cbn2d3XkJtJwzGzo4jIXPxvfFF5Zep5fsIijoKdrYpvJQsOFN0IWzspxPPZDSYZy/pemm6jc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-31.ladok.umu.se:8450/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://nya-31.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8450/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://nya-31.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL+FAivz13wLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ2WhcNMjEwODIwMTM0NjQ2WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALp5DV6Fu4Cat4s7g1LUE+PmQUsi83SlqhBMYHPVeYpUpCq7STPKqVHuNV083mOPHBJ73E1PVjjRf/0Jyg1yx6ECAwEAAaN/MH0wHQYDVR0OBBYEFG26WgTyYuTGeoxhLr/hx/H3xHkPME4GA1UdIwRHMEWAFG26WgTyYuTGeoxhLr/hx/H3xHkPoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAv4UCK/PXfAswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT+SzALKcgJx65cbn2d3XkJtJwzGzo4jIXPxvfFF5Zep5fsIijoKdrYpvJQsOFN0IWzspxPPZDSYZy/pemm6jc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-31.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml
index 64b659dc..5c9bcc90 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.ladok.umu.se/ecs-sp">
-
<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://nya-31.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ aa+JVhSWHrKvYC+St9hdzmMgo/d1Xd1ra5tkg9FIP1PbDuP4aYL9q0wcAtgiABMs
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml
index 4aead033..5904cfb0 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-31.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-31.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI/iS162LDzJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ3WhcNMjEwODIwMTM0NjQ3WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8g47yAwh8jny7DrxYLKs9ypQo3ImFoQJldx/+Bv7jimRLYIQWqs2EluY9j05O1C0pKOdQ3u+qd1C5O6tenqu0CAwEAAaN/MH0wHQYDVR0OBBYEFBw+B42Z8NlNFhxmqVcfswgxueUsME4GA1UdIwRHMEWAFBw+B42Z8NlNFhxmqVcfswgxueUsoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAj+JLXrYsPMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGNZkzRBEOudvbQsmbQksLknS+7Be7awb5owkt+qaxGN2anFB8zmK3mjehmZp0D4/eKt6abceEJIzG+x3yD6t5o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-31.ladok.umu.se:8448/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://nya-31.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8448/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://nya-31.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI/iS162LDzJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ3WhcNMjEwODIwMTM0NjQ3WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8g47yAwh8jny7DrxYLKs9ypQo3ImFoQJldx/+Bv7jimRLYIQWqs2EluY9j05O1C0pKOdQ3u+qd1C5O6tenqu0CAwEAAaN/MH0wHQYDVR0OBBYEFBw+B42Z8NlNFhxmqVcfswgxueUsME4GA1UdIwRHMEWAFBw+B42Z8NlNFhxmqVcfswgxueUsoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAj+JLXrYsPMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGNZkzRBEOudvbQsmbQksLknS+7Be7awb5owkt+qaxGN2anFB8zmK3mjehmZp0D4/eKt6abceEJIzG+x3yD6t5o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-31.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-31_idp-metadata.xml b/swamid-1.0/nya-31_idp-metadata.xml
index fbea0a65..5dac7d1e 100644
--- a/swamid-1.0/nya-31_idp-metadata.xml
+++ b/swamid-1.0/nya-31_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-31.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-31.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO8spGwUXjfVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMc0z2Nwa4XJFkH0LtoFqvwWAb3xjLD27KvWCtnWeuqD6y+Bs3m3IOVgKC7fnmnYSK2m96X8SEXohxekHuf/vwsCAwEAAaN/MH0wHQYDVR0OBBYEFGdrsuNRUmmjeqYiFlawR4s5UGe8ME4GA1UdIwRHMEWAFGdrsuNRUmmjeqYiFlawR4s5UGe8oSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkA7yykbBReN9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMFDnTFRRf6r2hNR8ZJcsKWk4Yx04zixXCLG0UIdEsjfOmgeaTsGSNtL0SHuZWOTqsvI35IZzohVud2xjBI1u+Y=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-31.ladok.umu.se:8452/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://nya-31.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8452/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://nya-31.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO8spGwUXjfVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMc0z2Nwa4XJFkH0LtoFqvwWAb3xjLD27KvWCtnWeuqD6y+Bs3m3IOVgKC7fnmnYSK2m96X8SEXohxekHuf/vwsCAwEAAaN/MH0wHQYDVR0OBBYEFGdrsuNRUmmjeqYiFlawR4s5UGe8ME4GA1UdIwRHMEWAFGdrsuNRUmmjeqYiFlawR4s5UGe8oSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkA7yykbBReN9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMFDnTFRRf6r2hNR8ZJcsKWk4Yx04zixXCLG0UIdEsjfOmgeaTsGSNtL0SHuZWOTqsvI35IZzohVud2xjBI1u+Y=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-31.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml
index 2d85578a..f2e45f5d 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-32.ladok.umu.se/aws-sp-en">
-
<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://nya-32.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ouqh4/BW89AV39CyWouTKL/oUDl8p4h3TjZ/doN4OaXUHRtAFKCp5gpkRg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml
index de10e871..ab4aaa16 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-32.ladok.umu.se/aws-sp">
-
<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://nya-32.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ybnD0i9t+UFDS/QhEKO6/is+8xtYfWVl2nUZy1pjnd4GL7Ayo2D8Ig==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml
index 82c79fa7..ae2c459c 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-32.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-32.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOg+2kBEwyGOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQwWhcNMjEwODIxMDcxNzQwWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO3JpytWooU9BzKpjAYTmc9Vb5w2w0VzuFFIWSQ6MHUuD/vSZm3uySKb1AEyJL3o8hxv1lgbs40rWzVfBlwZviUCAwEAAaN/MH0wHQYDVR0OBBYEFFVUxSdTq3dVlKHDmwOWDaPBGEpSME4GA1UdIwRHMEWAFFVUxSdTq3dVlKHDmwOWDaPBGEpSoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6D7aQETDIY4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMmOPe1KtG6OV/IxXE0issDWJZqYAY0FUvo6xXsvCGnFM3cDOeR9uqXMsUaNkhM6dCAlBSDYvZaEDbX1Rr8gUAo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-32.ladok.umu.se:8450/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://nya-32.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8450/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://nya-32.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOg+2kBEwyGOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQwWhcNMjEwODIxMDcxNzQwWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO3JpytWooU9BzKpjAYTmc9Vb5w2w0VzuFFIWSQ6MHUuD/vSZm3uySKb1AEyJL3o8hxv1lgbs40rWzVfBlwZviUCAwEAAaN/MH0wHQYDVR0OBBYEFFVUxSdTq3dVlKHDmwOWDaPBGEpSME4GA1UdIwRHMEWAFFVUxSdTq3dVlKHDmwOWDaPBGEpSoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6D7aQETDIY4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMmOPe1KtG6OV/IxXE0issDWJZqYAY0FUvo6xXsvCGnFM3cDOeR9uqXMsUaNkhM6dCAlBSDYvZaEDbX1Rr8gUAo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-32.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml
index 7536b845..298a064e 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-32.ladok.umu.se/ecs-sp">
-
<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://nya-32.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ VFqcetQMHP7Bf7EOgoJmijpn9mvX5vjvEqJOxjsuMjzTWc5r6uQufg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml
index 175f2b63..c3765bd5 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-32.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-32.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOsHKLbyS6geMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQyWhcNMjEwODIxMDcxNzQyWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u9Pce0+6GBIDbIukK1AK0YVWlQCVxrvHjX8weln6Zyki3srkXnknILM1AUJpemSW8HW8odll5u1/iuDaAtSUCAwEAAaN/MH0wHQYDVR0OBBYEFIOcjZ7DzsJi5pTPJPeNErmBwa0KME4GA1UdIwRHMEWAFIOcjZ7DzsJi5pTPJPeNErmBwa0KoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6wcotvJLqB4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHjJ6ap7ESc8tkH/lOVDIyjAGLQdrxJRY6Z0MZijoWl4p5NX1Tv8FfuzGMx2Fa1PmmN5n+xpFwsxSIVDDZf1lyI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-32.ladok.umu.se:8448/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://nya-32.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8448/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://nya-32.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOsHKLbyS6geMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQyWhcNMjEwODIxMDcxNzQyWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u9Pce0+6GBIDbIukK1AK0YVWlQCVxrvHjX8weln6Zyki3srkXnknILM1AUJpemSW8HW8odll5u1/iuDaAtSUCAwEAAaN/MH0wHQYDVR0OBBYEFIOcjZ7DzsJi5pTPJPeNErmBwa0KME4GA1UdIwRHMEWAFIOcjZ7DzsJi5pTPJPeNErmBwa0KoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6wcotvJLqB4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHjJ6ap7ESc8tkH/lOVDIyjAGLQdrxJRY6Z0MZijoWl4p5NX1Tv8FfuzGMx2Fa1PmmN5n+xpFwsxSIVDDZf1lyI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-32.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-32_idp-metadata.xml b/swamid-1.0/nya-32_idp-metadata.xml
index 9f2d87e9..eb9a0dda 100644
--- a/swamid-1.0/nya-32_idp-metadata.xml
+++ b/swamid-1.0/nya-32_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-32.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-32.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIKeOL8XOgAOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALJDpQuqMvs/3aNXW4l2V5KYiRkowLSxd2heHHMdmGzUNg3BU1gSv3Qnid3NE8OCcOnPJdYZVix/RdTDdUEgysECAwEAAaN/MH0wHQYDVR0OBBYEFLauid4m01JzblyhCZwlvSC88gJ7ME4GA1UdIwRHMEWAFLauid4m01JzblyhCZwlvSC88gJ7oSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkAgp44vxc6AA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAnZlXyv+fp1AgIvpTNlDfYty4mWZBuR3Z4j5WB4eoSHUmir+YQjhh4IkzdemE1tUaEy/7/6wA7JNxx5/eetOiE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-32.ladok.umu.se:8452/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://nya-32.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8452/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://nya-32.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIKeOL8XOgAOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALJDpQuqMvs/3aNXW4l2V5KYiRkowLSxd2heHHMdmGzUNg3BU1gSv3Qnid3NE8OCcOnPJdYZVix/RdTDdUEgysECAwEAAaN/MH0wHQYDVR0OBBYEFLauid4m01JzblyhCZwlvSC88gJ7ME4GA1UdIwRHMEWAFLauid4m01JzblyhCZwlvSC88gJ7oSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkAgp44vxc6AA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAnZlXyv+fp1AgIvpTNlDfYty4mWZBuR3Z4j5WB4eoSHUmir+YQjhh4IkzdemE1tUaEy/7/6wA7JNxx5/eetOiE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-32.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml
index 0963f1c3..86d62981 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-33.ladok.umu.se/aws-sp-en">
-
<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://nya-33.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ lbJXNPGJ31Iti7u9Y6zus33GbsXQqcHvkP2ouf1QDroQYEyl+fwSjfpuuA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml
index 82ee2fd5..3f6042b4 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-33.ladok.umu.se/aws-sp">
-
<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://nya-33.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ AxaYhIrukrvgvjdA0uqAk8qILOe7nb1E/rCY/vbbnJQ4NIU2tSm2xA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml
index edb704eb..d17b6251 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-33.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-33.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANrpM++GELEpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ1WhcNMjEwODIxMDcxNzQ1WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL8+IW2j4+oMEcmqfANdpghCxQpLuyptqRvhZ+Ys/v+2RJEI9750USxj4NymIdktQI3eOtUlGRkgZTjJChNYY+0CAwEAAaN/MH0wHQYDVR0OBBYEFMh9P6zaftbxe4ZPSMVMj+U3hGIdME4GA1UdIwRHMEWAFMh9P6zaftbxe4ZPSMVMj+U3hGIdoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkA2ukz74YQsSkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1n1shWQzRG86GQqaWQ8dCvGockEtSnp/UAmOUGWzjT3B3pajRGJIG1XsLA2TNL1r0Wgn28pGJmgLrFTFByBDA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-33.ladok.umu.se:8450/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://nya-33.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8450/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://nya-33.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANrpM++GELEpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ1WhcNMjEwODIxMDcxNzQ1WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL8+IW2j4+oMEcmqfANdpghCxQpLuyptqRvhZ+Ys/v+2RJEI9750USxj4NymIdktQI3eOtUlGRkgZTjJChNYY+0CAwEAAaN/MH0wHQYDVR0OBBYEFMh9P6zaftbxe4ZPSMVMj+U3hGIdME4GA1UdIwRHMEWAFMh9P6zaftbxe4ZPSMVMj+U3hGIdoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkA2ukz74YQsSkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1n1shWQzRG86GQqaWQ8dCvGockEtSnp/UAmOUGWzjT3B3pajRGJIG1XsLA2TNL1r0Wgn28pGJmgLrFTFByBDA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-33.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml
index f984700f..a597519d 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-33.ladok.umu.se/ecs-sp">
-
<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://nya-33.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ QGi6KqPz2nNLckpWNPQlqC3OZ5mz+9TOJ/xHXWKOEeOCsOqcL9dhZA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml
index 0cd74dd7..2ac645f8 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-33.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-33.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK8AwCttDkQDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ2WhcNMjEwODIxMDcxNzQ2WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOL66m8qixLOcilEifOBbFfKMBIEVr1T/UPvLmKy3TYMpArS69TlxSPwh4wVRaMIOy2nLOcI4wNelFr0Y94IkTUCAwEAAaN/MH0wHQYDVR0OBBYEFMcsn4OvyYTJ/uFAkmoy0fl2XrJyME4GA1UdIwRHMEWAFMcsn4OvyYTJ/uFAkmoy0fl2XrJyoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArwDAK20ORAMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHa50MUS5lmKpg+R0tGKvjiaTkjjdhCiXMZul1k4YgmMTwzdccEzeLPZTgh+HD/jGhrZuiq8BaoryHvAlszcVYI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-33.ladok.umu.se:8448/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://nya-33.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8448/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://nya-33.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK8AwCttDkQDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ2WhcNMjEwODIxMDcxNzQ2WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOL66m8qixLOcilEifOBbFfKMBIEVr1T/UPvLmKy3TYMpArS69TlxSPwh4wVRaMIOy2nLOcI4wNelFr0Y94IkTUCAwEAAaN/MH0wHQYDVR0OBBYEFMcsn4OvyYTJ/uFAkmoy0fl2XrJyME4GA1UdIwRHMEWAFMcsn4OvyYTJ/uFAkmoy0fl2XrJyoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArwDAK20ORAMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHa50MUS5lmKpg+R0tGKvjiaTkjjdhCiXMZul1k4YgmMTwzdccEzeLPZTgh+HD/jGhrZuiq8BaoryHvAlszcVYI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-33.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se.xml b/swamid-1.0/nya-33.ladok.umu.se.xml
index 5a7daeb7..2eec9c15 100644
--- a/swamid-1.0/nya-33.ladok.umu.se.xml
+++ b/swamid-1.0/nya-33.ladok.umu.se.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-33.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-33.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK39WA3m0E6iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTIwODMwMTQ0NDUwWhcNMjIwODI4MTQ0NDUwWjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUsrSe5Otn+zZC3rXoS28Px27BlcgKsRtYyuf01qCQLlurrTTOaQM0m6KY6+ZSqdNk+9LgCWtOBPTdyuismOT0CAwEAAaN/MH0wHQYDVR0OBBYEFFkVGPqsgS2mUPxFECuCmjIc5o/fME4GA1UdIwRHMEWAFFkVGPqsgS2mUPxFECuCmjIc5o/foSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArf1YDebQTqIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMq3YAKRUf8CdfHxZibwRDIk2pqz+sIEd7FaE1wtAhdoiXQ879SGK+lutrrkZ8bREKwPqNNTkSX1ZUVO0bz/Wos=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-33.ladok.umu.se:8452/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://nya-33.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8452/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://nya-33.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK39WA3m0E6iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTIwODMwMTQ0NDUwWhcNMjIwODI4MTQ0NDUwWjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUsrSe5Otn+zZC3rXoS28Px27BlcgKsRtYyuf01qCQLlurrTTOaQM0m6KY6+ZSqdNk+9LgCWtOBPTdyuismOT0CAwEAAaN/MH0wHQYDVR0OBBYEFFkVGPqsgS2mUPxFECuCmjIc5o/fME4GA1UdIwRHMEWAFFkVGPqsgS2mUPxFECuCmjIc5o/foSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArf1YDebQTqIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMq3YAKRUf8CdfHxZibwRDIk2pqz+sIEd7FaE1wtAhdoiXQ879SGK+lutrrkZ8bREKwPqNNTkSX1ZUVO0bz/Wos=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-33.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml
index f8546cce..657bcd3d 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-34.ladok.umu.se/aws-sp-en">
-
<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://nya-34.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ gAQFMTUAce/nzKsaiT7Ln4EUErD+pBWI+gZUjJGJY/5X8WeKdckgK/EcIcptunhn
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml
index 4054ecdc..4882534c 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-34.ladok.umu.se/aws-sp">
-
<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://nya-34.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ EKeWQcVdXArhEYNg4mL2ZyOVgbqXqyIBehWErGmPaklzzBZB/163RQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml
index 35cc94ef..8a36988a 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-34.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-34.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ6g3eRFq4aIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ5WhcNMjEwODIxMDcxNzQ5WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAF7of/7QAnBNta02sCWHVHIVmeDVck/3+msAxkzW+iqZuaAg9GfS6TTx/SXlkFhEwp4guGybu8EuAVt+LxM5kCAwEAAaN/MH0wHQYDVR0OBBYEFAdew5XfBB/1xRKUQryE1/u1JejzME4GA1UdIwRHMEWAFAdew5XfBB/1xRKUQryE1/u1JejzoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkAnqDd5EWrhogwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD1yTArACaVKX2ZzTqr9KciHyoMrZVF7yrOww8YEjFKJL2ObjGtjF/2cBRNIOpIOYQtzY+siPL/NjbQ4sbDAqAU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-34.ladok.umu.se:8450/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://nya-34.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8450/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://nya-34.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ6g3eRFq4aIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ5WhcNMjEwODIxMDcxNzQ5WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAF7of/7QAnBNta02sCWHVHIVmeDVck/3+msAxkzW+iqZuaAg9GfS6TTx/SXlkFhEwp4guGybu8EuAVt+LxM5kCAwEAAaN/MH0wHQYDVR0OBBYEFAdew5XfBB/1xRKUQryE1/u1JejzME4GA1UdIwRHMEWAFAdew5XfBB/1xRKUQryE1/u1JejzoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkAnqDd5EWrhogwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD1yTArACaVKX2ZzTqr9KciHyoMrZVF7yrOww8YEjFKJL2ObjGtjF/2cBRNIOpIOYQtzY+siPL/NjbQ4sbDAqAU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-34.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml
index 4a7a1f82..90482cc5 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-34.ladok.umu.se/ecs-sp">
-
<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://nya-34.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ zL57IjNvnf128YJ93hl1ZBT8gh+s10fCRNwYd4464RWmpJAxcNkIIw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml
index 20a64213..cef551b0 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-34.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-34.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOGqWFAzMYy0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUwWhcNMjEwODIxMDcxNzUwWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKCcdl3q42dB6Ux9AFR+pQKMo9v1dlPhRc/92kdVJjqDQNWp1uhouQ0xeX/l0B+/1sZy4l/AOOqTQ8cuUaSq5zcCAwEAAaN/MH0wHQYDVR0OBBYEFJc0RT4mtF6Nwgp1Mcmzv1StTUKaME4GA1UdIwRHMEWAFJc0RT4mtF6Nwgp1Mcmzv1StTUKaoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA4apYUDMxjLQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIcaitnABSqTkssZBy9lIkRPC+xrUKplUeSXzfiYjrhkmmj0yOcHOlxNYl5b+Jjc+vI7GTiSeWQzHjQdGDFgIXI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-34.ladok.umu.se:8448/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://nya-34.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8448/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://nya-34.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOGqWFAzMYy0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUwWhcNMjEwODIxMDcxNzUwWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKCcdl3q42dB6Ux9AFR+pQKMo9v1dlPhRc/92kdVJjqDQNWp1uhouQ0xeX/l0B+/1sZy4l/AOOqTQ8cuUaSq5zcCAwEAAaN/MH0wHQYDVR0OBBYEFJc0RT4mtF6Nwgp1Mcmzv1StTUKaME4GA1UdIwRHMEWAFJc0RT4mtF6Nwgp1Mcmzv1StTUKaoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA4apYUDMxjLQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIcaitnABSqTkssZBy9lIkRPC+xrUKplUeSXzfiYjrhkmmj0yOcHOlxNYl5b+Jjc+vI7GTiSeWQzHjQdGDFgIXI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-34.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-34_idp-metadata.xml b/swamid-1.0/nya-34_idp-metadata.xml
index c9be36b9..d16e3d6f 100644
--- a/swamid-1.0/nya-34_idp-metadata.xml
+++ b/swamid-1.0/nya-34_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-34.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-34.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANJz8/ROlR9RMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOmsFeV68C2ofkPerojlGIkGPYQg55G9gF2TwTqMomYjbVo6DBwEJM98BRINV9prj6zaOGrnuH0cgvVZEkjXKxUCAwEAAaN/MH0wHQYDVR0OBBYEFDuCvvBCGBkAJuatKgmIUgdacFhXME4GA1UdIwRHMEWAFDuCvvBCGBkAJuatKgmIUgdacFhXoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA0nPz9E6VH1EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpcgwdjR7qE/9nIfYGCrl6ERPcYAiMJb/FqPFqN5G9NdIjaIleDtjD+w1BGNm80QAfZRIHT7LdLBXxp9q/58pU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-34.ladok.umu.se:8452/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://nya-34.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8452/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://nya-34.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANJz8/ROlR9RMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOmsFeV68C2ofkPerojlGIkGPYQg55G9gF2TwTqMomYjbVo6DBwEJM98BRINV9prj6zaOGrnuH0cgvVZEkjXKxUCAwEAAaN/MH0wHQYDVR0OBBYEFDuCvvBCGBkAJuatKgmIUgdacFhXME4GA1UdIwRHMEWAFDuCvvBCGBkAJuatKgmIUgdacFhXoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA0nPz9E6VH1EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpcgwdjR7qE/9nIfYGCrl6ERPcYAiMJb/FqPFqN5G9NdIjaIleDtjD+w1BGNm80QAfZRIHT7LdLBXxp9q/58pU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-34.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml
index 22cb7275..c1a5fb12 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-35.ladok.umu.se/aws-sp-en">
-
<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://nya-35.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ PC7LK44YcvEIRMBINj1NvlD4wCjEM+JwUTQ8Be8/OhQ+5zrA8qI391pkEQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml
index 49f39170..334b2f25 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-35.ladok.umu.se/aws-sp">
-
<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://nya-35.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ djE+kWGReuRjmlaq5A75YtaPnKPYnCW6vj2GGLyB1km82M+IS35EF9jc1+1KyLnl
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml
index ae6f8ebc..b5562865 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-35.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-35.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOPTLQud5MzWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUzWhcNMjEwODIxMDcxNzUzWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPE14hGIrbHvoPMBrK1yLZbZkVUj3la0ZmiTV2+KD3vT4oSb3yOgbygzlB2K1HB/7F2YGTGYKe4xLVt518ddudMCAwEAAaN/MH0wHQYDVR0OBBYEFK4raEZEcCpUf+0RjyesTbVlIdoFME4GA1UdIwRHMEWAFK4raEZEcCpUf+0RjyesTbVlIdoFoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkA49MtC53kzNYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALnPuQS/e0weNyMk9GslZL7IgHULEoEUCf6hzPvp8jW6wcOS3bH87mpqkF7HUi2c6QBHxPGwO/w6ls558Qpsdbw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-35.ladok.umu.se:8450/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://nya-35.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8450/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://nya-35.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOPTLQud5MzWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUzWhcNMjEwODIxMDcxNzUzWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPE14hGIrbHvoPMBrK1yLZbZkVUj3la0ZmiTV2+KD3vT4oSb3yOgbygzlB2K1HB/7F2YGTGYKe4xLVt518ddudMCAwEAAaN/MH0wHQYDVR0OBBYEFK4raEZEcCpUf+0RjyesTbVlIdoFME4GA1UdIwRHMEWAFK4raEZEcCpUf+0RjyesTbVlIdoFoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkA49MtC53kzNYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALnPuQS/e0weNyMk9GslZL7IgHULEoEUCf6hzPvp8jW6wcOS3bH87mpqkF7HUi2c6QBHxPGwO/w6ls558Qpsdbw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-35.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml
index 055ff20e..093aff0c 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-35.ladok.umu.se/ecs-sp">
-
<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://nya-35.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ GxDhYTypY0xjc+tLcOU41Ug++m9wSiBjuwmZetEKZL/uGoRE0358/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml
index 963893ca..daa47e4b 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-35.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-35.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALALz9MxZInIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzU0WhcNMjEwODIxMDcxNzU0WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0OhjwgtQQ4g3TZrkOdWum33QSPdlfuCopPVgj4mePebFdi8J5E9eX5bFYsYfXRlCi+KcJTulC4cLUPqPdOHQUCAwEAAaN/MH0wHQYDVR0OBBYEFK6ZPcVgKRnGAXQT/QZcrK+k+zkrME4GA1UdIwRHMEWAFK6ZPcVgKRnGAXQT/QZcrK+k+zkroSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAsAvP0zFkicgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKDRlKJ8r+tmQDTHUehUupjj4PqZ23vipl5VLTlqZrHsLDjbWwdfUY/0JHD3MarVBHuF7dDJne/EMSplJSxuyvE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-35.ladok.umu.se:8448/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://nya-35.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8448/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://nya-35.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALALz9MxZInIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzU0WhcNMjEwODIxMDcxNzU0WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0OhjwgtQQ4g3TZrkOdWum33QSPdlfuCopPVgj4mePebFdi8J5E9eX5bFYsYfXRlCi+KcJTulC4cLUPqPdOHQUCAwEAAaN/MH0wHQYDVR0OBBYEFK6ZPcVgKRnGAXQT/QZcrK+k+zkrME4GA1UdIwRHMEWAFK6ZPcVgKRnGAXQT/QZcrK+k+zkroSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAsAvP0zFkicgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKDRlKJ8r+tmQDTHUehUupjj4PqZ23vipl5VLTlqZrHsLDjbWwdfUY/0JHD3MarVBHuF7dDJne/EMSplJSxuyvE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-35.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-35_idp-metadata.xml b/swamid-1.0/nya-35_idp-metadata.xml
index 323479c7..31759408 100644
--- a/swamid-1.0/nya-35_idp-metadata.xml
+++ b/swamid-1.0/nya-35_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-35.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-35.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL80njSzSj7mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJSKr3oTpcKmZyFzViQHES/9TYy55ooHPWWw8p89oxHx4EqEBcrvOAF4qp/FTYripv8SmpLrZXFGR52d7vCgkd8CAwEAAaN/MH0wHQYDVR0OBBYEFPr3G1G+cwkBrScyXi2rQ8UEPxjgME4GA1UdIwRHMEWAFPr3G1G+cwkBrScyXi2rQ8UEPxjgoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAvzSeNLNKPuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAItmUdJbExnrE+Ie1LVb7uIK4MZBBjt9hx0HmSpVoQuyNP/cKgoRvk+604ol0Ww6sLSNW46d/rCVcn33P1qOKJw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-35.ladok.umu.se:8452/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://nya-35.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8452/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://nya-35.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL80njSzSj7mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJSKr3oTpcKmZyFzViQHES/9TYy55ooHPWWw8p89oxHx4EqEBcrvOAF4qp/FTYripv8SmpLrZXFGR52d7vCgkd8CAwEAAaN/MH0wHQYDVR0OBBYEFPr3G1G+cwkBrScyXi2rQ8UEPxjgME4GA1UdIwRHMEWAFPr3G1G+cwkBrScyXi2rQ8UEPxjgoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAvzSeNLNKPuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAItmUdJbExnrE+Ie1LVb7uIK4MZBBjt9hx0HmSpVoQuyNP/cKgoRvk+604ol0Ww6sLSNW46d/rCVcn33P1qOKJw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-35.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml
index a9d742bb..aa60398e 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-36.ladok.umu.se/aws-sp-en">
-
<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://nya-36.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ fR7Mgv7dwRyEa5eRgSTdxngJEIQ2/96kThMvqEOn8M85N51fr/8jQaPrRQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml
index dba3cf7f..addb596b 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-36.ladok.umu.se/aws-sp">
-
<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://nya-36.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ wBlhut5PYW3TeSQIoUI4fZdyL+KUHhKsV5vxkWARz7ZLqFWRnDey6Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml
index 30b3767d..74210276 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-36.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-36.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOUFSKeyX1XTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM4WhcNMjIwMjE3MTIwMTM4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ0GoQxZ8PeJhgVeuhbQrHHrE4KtfUdKOoUYmIYNWgT86yR/Ey1CRrPjJvwnPuvZx3IWHCYwir7fuybogJC55MCAwEAAaN/MH0wHQYDVR0OBBYEFD7vdCpJmLeUOweTluP/6iKKH0VWME4GA1UdIwRHMEWAFD7vdCpJmLeUOweTluP/6iKKH0VWoSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkA5QVIp7JfVdMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI2yS/NRKFc+8e/XV4sbhCj1xRMBTRp0tc8cSJqNs2/rFgM4Va3ISCgZAPlNmPMG52j1qdDmJuxlzOFwIrNg04w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-36.ladok.umu.se:8450/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://nya-36.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8450/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://nya-36.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOUFSKeyX1XTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM4WhcNMjIwMjE3MTIwMTM4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ0GoQxZ8PeJhgVeuhbQrHHrE4KtfUdKOoUYmIYNWgT86yR/Ey1CRrPjJvwnPuvZx3IWHCYwir7fuybogJC55MCAwEAAaN/MH0wHQYDVR0OBBYEFD7vdCpJmLeUOweTluP/6iKKH0VWME4GA1UdIwRHMEWAFD7vdCpJmLeUOweTluP/6iKKH0VWoSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkA5QVIp7JfVdMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI2yS/NRKFc+8e/XV4sbhCj1xRMBTRp0tc8cSJqNs2/rFgM4Va3ISCgZAPlNmPMG52j1qdDmJuxlzOFwIrNg04w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-36.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml
index 53a27dfd..a4870290 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-36.ladok.umu.se/ecs-sp">
-
<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://nya-36.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ mB2mFhL1WTyIupbJ+KS/jPD49LDSmC/F7wM2Yp5zyURg70eCYcoi3w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml
index 4296eb6b..b7e871ea 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-36.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-36.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKD7mfgoJBv1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTQxWhcNMjIwMjE3MTIwMTQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmKP8x6NhNQc6ki9Cs01HUVGAWebMoyzmP4LWA/OxMy/n5yxWPCap+uIY45UE/BjKk74I9nS05gGaU4JCB8lj0CAwEAAaN/MH0wHQYDVR0OBBYEFClgB4EwaghSTdppXdERa/D5lE67ME4GA1UdIwRHMEWAFClgB4EwaghSTdppXdERa/D5lE67oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAoPuZ+CgkG/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABDYTXMQD86kjnDusuvT12SH92JdxhyZ1rjKI8q3DZIjkMsq0erCrRldfXcXJbGJ4hVh41TXgswAylKiBnvL6Ww=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-36.ladok.umu.se:8448/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://nya-36.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8448/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://nya-36.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKD7mfgoJBv1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTQxWhcNMjIwMjE3MTIwMTQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmKP8x6NhNQc6ki9Cs01HUVGAWebMoyzmP4LWA/OxMy/n5yxWPCap+uIY45UE/BjKk74I9nS05gGaU4JCB8lj0CAwEAAaN/MH0wHQYDVR0OBBYEFClgB4EwaghSTdppXdERa/D5lE67ME4GA1UdIwRHMEWAFClgB4EwaghSTdppXdERa/D5lE67oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAoPuZ+CgkG/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABDYTXMQD86kjnDusuvT12SH92JdxhyZ1rjKI8q3DZIjkMsq0erCrRldfXcXJbGJ4hVh41TXgswAylKiBnvL6Ww=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-36.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-36_idp-metadata.xml b/swamid-1.0/nya-36_idp-metadata.xml
index 697e5ee5..e6fe55e7 100644
--- a/swamid-1.0/nya-36_idp-metadata.xml
+++ b/swamid-1.0/nya-36_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-36.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-36.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ8fs8aHtEnwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3gDZWyrZNACXi1Q4sEHhGFDY7tUkGLWF2VJ86Ck2oEpkhscMVEwjZAwde4DA+cddFVHrHshz4pW6ixLCmjr98CAwEAAaN/MH0wHQYDVR0OBBYEFIrWNR2B7Zv8+UMXL5aGFmE2N7v4ME4GA1UdIwRHMEWAFIrWNR2B7Zv8+UMXL5aGFmE2N7v4oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAnx+zxoe0SfAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUidD6y/E8t45SkQPf7xoiXnZ2BdB9JKj5KYd/GLPtjRiQaeckqMCyjCjuAliCtMhOvqXXRwTMLGy1v9mePoGU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-36.ladok.umu.se:8452/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://nya-36.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8452/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://nya-36.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ8fs8aHtEnwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3gDZWyrZNACXi1Q4sEHhGFDY7tUkGLWF2VJ86Ck2oEpkhscMVEwjZAwde4DA+cddFVHrHshz4pW6ixLCmjr98CAwEAAaN/MH0wHQYDVR0OBBYEFIrWNR2B7Zv8+UMXL5aGFmE2N7v4ME4GA1UdIwRHMEWAFIrWNR2B7Zv8+UMXL5aGFmE2N7v4oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAnx+zxoe0SfAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUidD6y/E8t45SkQPf7xoiXnZ2BdB9JKj5KYd/GLPtjRiQaeckqMCyjCjuAliCtMhOvqXXRwTMLGy1v9mePoGU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-36.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml
index 204806c9..34ee0ba9 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-37.ladok.umu.se/aws-sp-en">
-
<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://nya-37.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ eat0N8YeSkn/Z2DvjMf2OebesWImhtYpKpF+6q43m989s/xlg8ILDD8GGQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml
index fe55e8f8..300f4573 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-37.ladok.umu.se/aws-sp">
-
<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://nya-37.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ZHSe1xT7XuBxH2JFvECjWNNZArzl00djIgQjxahPpKj61g9+wwIveA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml
index 6c755879..f840f441 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-37.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-37.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANQSOJh8DYXlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMyWhcNMjIwMjE3MTIxMDMyWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0YAPxyYgLCi652c6oxlILzsqfxlc29VFGtk6Xrr0CAkEUoL7n3YfpTXCvhjrbZBvKWMtlL/fIOn/u15QE0SNsCAwEAAaN/MH0wHQYDVR0OBBYEFLJXiHVL7rtdbeyMCG6fFvNPLDRvME4GA1UdIwRHMEWAFLJXiHVL7rtdbeyMCG6fFvNPLDRvoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkA1BI4mHwNheUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKTC9M8yklP0sQBq6FMPFKgVtD5Ba7/r/1gr4eJK/kjA3zte+sRVJU+iLbHhGoJ2t7KE7jCCus4/O5C0lfSD6uk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-37.ladok.umu.se:8450/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://nya-37.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8450/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://nya-37.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANQSOJh8DYXlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMyWhcNMjIwMjE3MTIxMDMyWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0YAPxyYgLCi652c6oxlILzsqfxlc29VFGtk6Xrr0CAkEUoL7n3YfpTXCvhjrbZBvKWMtlL/fIOn/u15QE0SNsCAwEAAaN/MH0wHQYDVR0OBBYEFLJXiHVL7rtdbeyMCG6fFvNPLDRvME4GA1UdIwRHMEWAFLJXiHVL7rtdbeyMCG6fFvNPLDRvoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkA1BI4mHwNheUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKTC9M8yklP0sQBq6FMPFKgVtD5Ba7/r/1gr4eJK/kjA3zte+sRVJU+iLbHhGoJ2t7KE7jCCus4/O5C0lfSD6uk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-37.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml
index d4de91a0..27bf0dac 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-37.ladok.umu.se/ecs-sp">
-
<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://nya-37.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ nTtTiknWevaR9hS4GeQtvdaoMIeFPrDgt+hI3VUgbif73APZm3+xBg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml
index 364a30f7..8210e204 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-37.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-37.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKcFwf30paUrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMzWhcNMjIwMjE3MTIxMDMzWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ5BqSWVMjhLmhxRoCO3ymBRM1FiKHl7qjY07o4rlxf8XXvOhq4l/71Bt/wamT3zbwexJ1mzQhdGZCEMpovHBDcCAwEAAaN/MH0wHQYDVR0OBBYEFB6dxB00TWNk7M1dNN3Cf9MN214mME4GA1UdIwRHMEWAFB6dxB00TWNk7M1dNN3Cf9MN214moSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkApwXB/fSlpSswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEx473bgDNTZXsU6z4LvWwfbtWYAGPyxuAySZBno76qWLhsP22B85B40cQZLvz0VKhlYWixEZKqDn3fm3eXQUZs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-37.ladok.umu.se:8448/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://nya-37.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8448/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://nya-37.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKcFwf30paUrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMzWhcNMjIwMjE3MTIxMDMzWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ5BqSWVMjhLmhxRoCO3ymBRM1FiKHl7qjY07o4rlxf8XXvOhq4l/71Bt/wamT3zbwexJ1mzQhdGZCEMpovHBDcCAwEAAaN/MH0wHQYDVR0OBBYEFB6dxB00TWNk7M1dNN3Cf9MN214mME4GA1UdIwRHMEWAFB6dxB00TWNk7M1dNN3Cf9MN214moSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkApwXB/fSlpSswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEx473bgDNTZXsU6z4LvWwfbtWYAGPyxuAySZBno76qWLhsP22B85B40cQZLvz0VKhlYWixEZKqDn3fm3eXQUZs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-37.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-37_idp-metadata.xml b/swamid-1.0/nya-37_idp-metadata.xml
index 494cd498..7737c49a 100644
--- a/swamid-1.0/nya-37_idp-metadata.xml
+++ b/swamid-1.0/nya-37_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-37.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-37.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI/cAdOMvOANMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL5rGq8Flv0+oUCTJcVUmdE9WgJdcq3bfe7icQWuqKEdfOpTGb2GaEbVocHE/jm3PJNfUhIS+JXJ3AG1J+gflusCAwEAAaN/MH0wHQYDVR0OBBYEFNReZO7G4daB1PXd64+LpZX7zSjeME4GA1UdIwRHMEWAFNReZO7G4daB1PXd64+LpZX7zSjeoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkAj9wB04y84A0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFoQKsgA50KgQHTH2Krb2oc0RFtbPg1it/STHhpKBdp2or/DBtiCqLRH/Uej9blM9rbhPVcFP/7xB4LiL/6WwyE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-37.ladok.umu.se:8452/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://nya-37.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8452/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://nya-37.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI/cAdOMvOANMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL5rGq8Flv0+oUCTJcVUmdE9WgJdcq3bfe7icQWuqKEdfOpTGb2GaEbVocHE/jm3PJNfUhIS+JXJ3AG1J+gflusCAwEAAaN/MH0wHQYDVR0OBBYEFNReZO7G4daB1PXd64+LpZX7zSjeME4GA1UdIwRHMEWAFNReZO7G4daB1PXd64+LpZX7zSjeoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkAj9wB04y84A0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFoQKsgA50KgQHTH2Krb2oc0RFtbPg1it/STHhpKBdp2or/DBtiCqLRH/Uej9blM9rbhPVcFP/7xB4LiL/6WwyE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-37.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml
index cdfcf889..141d0493 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-38.ladok.umu.se/aws-sp-en">
-
<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://nya-38.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ouhG3uRk/VpdHB1t83UtN43XlyU/AwoVAoEIaWp45I6yl9z5QuvOdTtYRg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml
index 1ec472f2..03af1d80 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-38.ladok.umu.se/aws-sp">
-
<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://nya-38.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ lsGuLcchB/CZ1HM8G0wCcUEWMU8qKgs2kQFl457i3RlMt3z4wuTTKw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml
index f685db92..c013dfa9 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-38.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-38.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALkOSq6QP9CwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM4WhcNMjIwMjE3MTIxMjM4WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmBqh5xqxw8Eh05fh9ILUobYrHZ1zCcXAGEIH+YWTzkvHaOIVMCeCbrnqn/ctQyNUT00i9iyTL3rMzdtcx79IsCAwEAAaN/MH0wHQYDVR0OBBYEFKUhUr2yFolkiwzUTjgAJcyYtKSzME4GA1UdIwRHMEWAFKUhUr2yFolkiwzUTjgAJcyYtKSzoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAuQ5KrpA/0LAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJab8oUqUMnxz0ofX8wWpTt9USDqOL0T4aWK64jdkQTdQ2SGGMphaLvzWB1QL0ZS3nXeljDiqkWBbg4mKwPFZbw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-38.ladok.umu.se:8450/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://nya-38.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8450/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://nya-38.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALkOSq6QP9CwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM4WhcNMjIwMjE3MTIxMjM4WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmBqh5xqxw8Eh05fh9ILUobYrHZ1zCcXAGEIH+YWTzkvHaOIVMCeCbrnqn/ctQyNUT00i9iyTL3rMzdtcx79IsCAwEAAaN/MH0wHQYDVR0OBBYEFKUhUr2yFolkiwzUTjgAJcyYtKSzME4GA1UdIwRHMEWAFKUhUr2yFolkiwzUTjgAJcyYtKSzoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAuQ5KrpA/0LAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJab8oUqUMnxz0ofX8wWpTt9USDqOL0T4aWK64jdkQTdQ2SGGMphaLvzWB1QL0ZS3nXeljDiqkWBbg4mKwPFZbw=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-38.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml
index 895b5ce5..188c787f 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-38.ladok.umu.se/ecs-sp">
-
<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://nya-38.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Nvbt/k6pfBIFhX0/mE+EqipRvValz9tDhkEWKgoD49H0JZtePcTN1g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml
index c347d5ff..f45c1d75 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-38.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-38.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI7URs2IkOEeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQwWhcNMjIwMjE3MTIxMjQwWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKSrh71WpRxHpc08bzB/P9B5z9ueXbeoi09l0an2X89D6G01m940MRASUAhyWZ6mJucMA0WzvvPxU4uAvOijtKcCAwEAAaN/MH0wHQYDVR0OBBYEFCECWB8zphKePP+ERDZgfRysSxFnME4GA1UdIwRHMEWAFCECWB8zphKePP+ERDZgfRysSxFnoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAjtRGzYiQ4R4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEcOTYYwlM3fHQeur6GupnQ9qF/IlCgFFvZeEdCF9y0hj+YvdGaAFb6MYhkO+eQ6fpdTLW2hZJ+r/1jr9miB+OY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-38.ladok.umu.se:8448/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://nya-38.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8448/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://nya-38.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI7URs2IkOEeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQwWhcNMjIwMjE3MTIxMjQwWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKSrh71WpRxHpc08bzB/P9B5z9ueXbeoi09l0an2X89D6G01m940MRASUAhyWZ6mJucMA0WzvvPxU4uAvOijtKcCAwEAAaN/MH0wHQYDVR0OBBYEFCECWB8zphKePP+ERDZgfRysSxFnME4GA1UdIwRHMEWAFCECWB8zphKePP+ERDZgfRysSxFnoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAjtRGzYiQ4R4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEcOTYYwlM3fHQeur6GupnQ9qF/IlCgFFvZeEdCF9y0hj+YvdGaAFb6MYhkO+eQ6fpdTLW2hZJ+r/1jr9miB+OY=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-38.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-38_idp-metadata.xml b/swamid-1.0/nya-38_idp-metadata.xml
index 430d5905..ea5ec30a 100644
--- a/swamid-1.0/nya-38_idp-metadata.xml
+++ b/swamid-1.0/nya-38_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-38.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-38.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJC1ZZlbTkzKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2Y4TPUpsyS2tFgcrzEJx7y6JvWYU90YYRKEs1G1S4ernJeJbAHKB3M7izNwfuFNZrqPexiHx1+oY58m8GJzvkCAwEAAaN/MH0wHQYDVR0OBBYEFOF4WzH19gx9AUmnRUUOXOxTP2/TME4GA1UdIwRHMEWAFOF4WzH19gx9AUmnRUUOXOxTP2/ToSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAkLVlmVtOTMowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH1tV9F6xuzlNVkATr/OdUoOAhgrDmMkCtMwmm28uVITJtvt4givfH9YCRyrb5rcep909YxOxI9L7bxh7gnNPmQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-38.ladok.umu.se:8452/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://nya-38.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8452/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://nya-38.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJC1ZZlbTkzKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2Y4TPUpsyS2tFgcrzEJx7y6JvWYU90YYRKEs1G1S4ernJeJbAHKB3M7izNwfuFNZrqPexiHx1+oY58m8GJzvkCAwEAAaN/MH0wHQYDVR0OBBYEFOF4WzH19gx9AUmnRUUOXOxTP2/TME4GA1UdIwRHMEWAFOF4WzH19gx9AUmnRUUOXOxTP2/ToSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAkLVlmVtOTMowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH1tV9F6xuzlNVkATr/OdUoOAhgrDmMkCtMwmm28uVITJtvt4givfH9YCRyrb5rcep909YxOxI9L7bxh7gnNPmQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-38.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml
index 5aa58764..fafa6ac3 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-39.ladok.umu.se/aws-sp-en">
-
<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://nya-39.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ DeCin/leSnPSxZcR+pWAMG1nG3SVFMbBI6uRSvx7GtU0Cd41IOTyUq+1gQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml
index 3105f630..dc7a105b 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-39.ladok.umu.se/aws-sp">
-
<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://nya-39.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ gWKpQ6+QGURDc1X8jypZjqk9TvCZSeLVYFJIHm0UwFLJX13d4SHqv8izwISCI4I9
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml
index a39b9423..86be0a83 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-39.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-39.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIPXenEcg5tiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ1WhcNMjIwMjE3MTIxMjQ1WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyASmHnICIEwqZeR9WdVOl9dzIsLwn8wiKpOlL5On6CEhOeUTOo3LeutW7zYGRk5Eg6Rrpdsm+l6E8L/3jmS7UCAwEAAaN/MH0wHQYDVR0OBBYEFNC4n78VymxPhS/PPLrtUmf4rJbeME4GA1UdIwRHMEWAFNC4n78VymxPhS/PPLrtUmf4rJbeoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAg9d6cRyDm2IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADONFz3WlNibvfBQT7y3sGC0g5qWSRpzlsn/x1R+KrOF4Rek69+SiyharWbFcyvrN692VMeHJFlanx2AMc8RsMI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-39.ladok.umu.se:8450/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://nya-39.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8450/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://nya-39.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIPXenEcg5tiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ1WhcNMjIwMjE3MTIxMjQ1WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyASmHnICIEwqZeR9WdVOl9dzIsLwn8wiKpOlL5On6CEhOeUTOo3LeutW7zYGRk5Eg6Rrpdsm+l6E8L/3jmS7UCAwEAAaN/MH0wHQYDVR0OBBYEFNC4n78VymxPhS/PPLrtUmf4rJbeME4GA1UdIwRHMEWAFNC4n78VymxPhS/PPLrtUmf4rJbeoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAg9d6cRyDm2IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADONFz3WlNibvfBQT7y3sGC0g5qWSRpzlsn/x1R+KrOF4Rek69+SiyharWbFcyvrN692VMeHJFlanx2AMc8RsMI=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-39.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml
index 77bf4e44..817a216c 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-39.ladok.umu.se/ecs-sp">
-
<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://nya-39.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ ebXWUlMNQ8JERykWC82NTJDqFyXv/kBm+wIKdQ6/yeMttKRfr3CYToK6Xra1Jg9X
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml
index 50e17ea1..7a237352 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-39.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-39.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL7QWW8JnMaHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ2WhcNMjIwMjE3MTIxMjQ2WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALVAkItloTVPfqu0FxE33+p9eI1Y/JYFKZRaW7UK+lbHNRlPK5kf/bFqhnLabZZrppP6ZsoW7Xq/EjkCeMwm948CAwEAAaN/MH0wHQYDVR0OBBYEFADVgAWH6cDxy9gXC5rMW2rWyQxwME4GA1UdIwRHMEWAFADVgAWH6cDxy9gXC5rMW2rWyQxwoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvtBZbwmcxocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAASA845YW++b6UhKU5Y0WWSUThNGco1CsIWAzV/ALdASRsAI6zYpzucrMiSyknyW4upCXzBi7nxGpXeo9BEoXyQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-39.ladok.umu.se:8448/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://nya-39.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8448/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://nya-39.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL7QWW8JnMaHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ2WhcNMjIwMjE3MTIxMjQ2WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALVAkItloTVPfqu0FxE33+p9eI1Y/JYFKZRaW7UK+lbHNRlPK5kf/bFqhnLabZZrppP6ZsoW7Xq/EjkCeMwm948CAwEAAaN/MH0wHQYDVR0OBBYEFADVgAWH6cDxy9gXC5rMW2rWyQxwME4GA1UdIwRHMEWAFADVgAWH6cDxy9gXC5rMW2rWyQxwoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvtBZbwmcxocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAASA845YW++b6UhKU5Y0WWSUThNGco1CsIWAzV/ALdASRsAI6zYpzucrMiSyknyW4upCXzBi7nxGpXeo9BEoXyQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-39.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-39_idp-metadata.xml b/swamid-1.0/nya-39_idp-metadata.xml
index 42ea0659..c3d3139a 100644
--- a/swamid-1.0/nya-39_idp-metadata.xml
+++ b/swamid-1.0/nya-39_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-39.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-39.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL0oFTmh0vb1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALdajG1txEb7uhJXOjXVtbGMcoFOSu7XbT75I0Df8Notv1mDf7OQuW9h3BqMK+pkO3yGZM5FeoEhTQwHiHgRhPECAwEAAaN/MH0wHQYDVR0OBBYEFHK5+JrJOSV1wh8d9vJiSBo93rVcME4GA1UdIwRHMEWAFHK5+JrJOSV1wh8d9vJiSBo93rVcoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvSgVOaHS9vUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABD81/mWxeSu6+rIJ4IxmZR+Io2hRtrT6JlxwiHzz+/e4a7mWjteog52eFkDiUgU5OFdIhFWDQ+NRzWbUulkXD8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-39.ladok.umu.se:8452/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://nya-39.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8452/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://nya-39.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL0oFTmh0vb1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALdajG1txEb7uhJXOjXVtbGMcoFOSu7XbT75I0Df8Notv1mDf7OQuW9h3BqMK+pkO3yGZM5FeoEhTQwHiHgRhPECAwEAAaN/MH0wHQYDVR0OBBYEFHK5+JrJOSV1wh8d9vJiSBo93rVcME4GA1UdIwRHMEWAFHK5+JrJOSV1wh8d9vJiSBo93rVcoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvSgVOaHS9vUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABD81/mWxeSu6+rIJ4IxmZR+Io2hRtrT6JlxwiHzz+/e4a7mWjteog52eFkDiUgU5OFdIhFWDQ+NRzWbUulkXD8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-39.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml
index 3f866823..a7ece519 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.ladok.umu.se/aws-sp-en">
-
<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://nya-40.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ q/uvja1ROVq95gYP9wQBTzxL0qoHam8hkAVHtix0hThK4Z1xar5trAEoL6n/FNVk
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml
index 62e3dac3..08a8c570 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.ladok.umu.se/aws-sp">
-
<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://nya-40.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Nm6Gio/u8sR3+Np9/lcNdZq221jLHIzaf27PaWfZQO0yVE4/RH/0/g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml
index 35d87210..0e288dae 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-40.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-40.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI6RtLz879hzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUwWhcNMjIwMjE3MTIxMjUwWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALmaZsjh/+I86BDif6E/ZTau9abkHNjI/B3wfj63m/wd42pEnF7zyb/cgfozIcKrRfJ5sUutikljMnPXK3yYxQcCAwEAAaN/MH0wHQYDVR0OBBYEFIH9zBGKIQGgTyMC61sO6vMl5gphME4GA1UdIwRHMEWAFIH9zBGKIQGgTyMC61sO6vMl5gphoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkAjpG0vPzv2HMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJQu+1fRJwRUaQen2be6Uyk0l40EE96ts1fZ78VM6mbSrLAw1zVf82pKkB3WHtOWWs47uC/OTv7rNQD5nYeufg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-40.ladok.umu.se:8450/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://nya-40.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8450/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://nya-40.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAI6RtLz879hzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUwWhcNMjIwMjE3MTIxMjUwWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALmaZsjh/+I86BDif6E/ZTau9abkHNjI/B3wfj63m/wd42pEnF7zyb/cgfozIcKrRfJ5sUutikljMnPXK3yYxQcCAwEAAaN/MH0wHQYDVR0OBBYEFIH9zBGKIQGgTyMC61sO6vMl5gphME4GA1UdIwRHMEWAFIH9zBGKIQGgTyMC61sO6vMl5gphoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkAjpG0vPzv2HMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJQu+1fRJwRUaQen2be6Uyk0l40EE96ts1fZ78VM6mbSrLAw1zVf82pKkB3WHtOWWs47uC/OTv7rNQD5nYeufg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-40.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml
index 6ff349be..ef2fa310 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.ladok.umu.se/ecs-sp">
-
<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://nya-40.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ mDWz1pcSoipCbE/xT96vf388dBYIryBl2nclJCkKKCaoHbHlmvSmgQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml
index 8e336cf6..c90cc3c2 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-40.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-40.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOc/9gbUJAiMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUxWhcNMjIwMjE3MTIxMjUxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMSZJ23hXEyD96fmPW7JZpwxwKyL8mYGjxKfkaGIdeEVo9qyZaimhG1ICVym12ChN9C13eV8WXno7PXNlCerMhkCAwEAAaN/MH0wHQYDVR0OBBYEFJwkIobyPi4aaJJ8XK9q51C94BIcME4GA1UdIwRHMEWAFJwkIobyPi4aaJJ8XK9q51C94BIcoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA5z/2BtQkCIwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALMoNdHiLIivPqBtRzLgWqrpkpwX6liXi4yb2G0Wx+g0+q6IPFkeJOTTazpq5eXjeTSGaN/tfXtVF+RVV6Vk8Ic=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-40.ladok.umu.se:8448/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://nya-40.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8448/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://nya-40.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOc/9gbUJAiMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUxWhcNMjIwMjE3MTIxMjUxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMSZJ23hXEyD96fmPW7JZpwxwKyL8mYGjxKfkaGIdeEVo9qyZaimhG1ICVym12ChN9C13eV8WXno7PXNlCerMhkCAwEAAaN/MH0wHQYDVR0OBBYEFJwkIobyPi4aaJJ8XK9q51C94BIcME4GA1UdIwRHMEWAFJwkIobyPi4aaJJ8XK9q51C94BIcoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA5z/2BtQkCIwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALMoNdHiLIivPqBtRzLgWqrpkpwX6liXi4yb2G0Wx+g0+q6IPFkeJOTTazpq5eXjeTSGaN/tfXtVF+RVV6Vk8Ic=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-40.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-40_idp-metadata.xml b/swamid-1.0/nya-40_idp-metadata.xml
index 76ba63d5..01fda788 100644
--- a/swamid-1.0/nya-40_idp-metadata.xml
+++ b/swamid-1.0/nya-40_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-40.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-40.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANLHFWDc9uZ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALb3r16qOdyqvWbB8/NgumaHE+fOX+AqQe+S+6/AEB8bg9rS4PnLNF16I4guhjPlyvLihvWUp0VBN8FO9Tnb+K8CAwEAAaN/MH0wHQYDVR0OBBYEFOAETL3KWLItawiXBbda0NfSy5HhME4GA1UdIwRHMEWAFOAETL3KWLItawiXBbda0NfSy5HhoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA0scVYNz25n8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAK77F4uvHMutIsFd7N2d8p8KnTpp9nrNuKusdnyPqrlq/TNwnHsJqNv62msPLARX1aEefLpwL9ZTvy44b66uuGk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-40.ladok.umu.se:8452/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://nya-40.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8452/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://nya-40.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANLHFWDc9uZ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALb3r16qOdyqvWbB8/NgumaHE+fOX+AqQe+S+6/AEB8bg9rS4PnLNF16I4guhjPlyvLihvWUp0VBN8FO9Tnb+K8CAwEAAaN/MH0wHQYDVR0OBBYEFOAETL3KWLItawiXBbda0NfSy5HhME4GA1UdIwRHMEWAFOAETL3KWLItawiXBbda0NfSy5HhoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA0scVYNz25n8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAK77F4uvHMutIsFd7N2d8p8KnTpp9nrNuKusdnyPqrlq/TNwnHsJqNv62msPLARX1aEefLpwL9ZTvy44b66uuGk=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-40.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml
index d6ed74a5..670e9fdf 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-41.ladok.umu.se/aws-sp-en">
-
<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://nya-41.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ WiqKGwij3hl7nF2KVqwcG1YM9NLhyzbrQZHeki6B707IZMNJVCZJsxlw3A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml
index 6590db32..90bb7202 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-41.ladok.umu.se/aws-sp">
-
<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://nya-41.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ F1LJsIg9iKgzjzGPmfLnrdZFMng+VTZGjaExWGWNdv6fX5X8KgtKpA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml
index b5f5f578..25e031e5 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-41.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-41.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO47PA0xQWW7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYxx16evE8JgNJrVwEN2YC3aO6WVum6FSFNSPA05IBYCSU4dp8qIkXSs3yLbTMGi55y6jJgiPuoQYThEOTa7NkCAwEAAaN/MH0wHQYDVR0OBBYEFLkC1ViuBeSdNuRpZeVDY5DbjJSdME4GA1UdIwRHMEWAFLkC1ViuBeSdNuRpZeVDY5DbjJSdoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA7js8DTFBZbswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF55ogmFfk/EbE0PBfAURN42UkwMyAQTVu5ZMM3fztaCwvadASi7irSEgnRWnb+aC/GrYSf1/ot19hPjWBLJ4Vs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-41.ladok.umu.se:8450/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://nya-41.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8450/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://nya-41.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO47PA0xQWW7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYxx16evE8JgNJrVwEN2YC3aO6WVum6FSFNSPA05IBYCSU4dp8qIkXSs3yLbTMGi55y6jJgiPuoQYThEOTa7NkCAwEAAaN/MH0wHQYDVR0OBBYEFLkC1ViuBeSdNuRpZeVDY5DbjJSdME4GA1UdIwRHMEWAFLkC1ViuBeSdNuRpZeVDY5DbjJSdoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA7js8DTFBZbswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF55ogmFfk/EbE0PBfAURN42UkwMyAQTVu5ZMM3fztaCwvadASi7irSEgnRWnb+aC/GrYSf1/ot19hPjWBLJ4Vs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-41.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml
index daa4e9e2..1a1795b0 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-41.ladok.umu.se/ecs-sp">
-
<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://nya-41.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ c/ojHalFbRTgGAzCAsVhKoB/sSFxrfNlrLyStOltoXtL0NTCukgCTg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml
index cb8d5147..0ee46e7b 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-41.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-41.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOlIcHBer9kXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuOZSnPO78gASdSBT+E4z0sJQTy9+6mxGLAmywHtazJgAKYWzf3YmVln1SVNIw/s6eut9WOuDvBlhoJJj0vxG8CAwEAAaN/MH0wHQYDVR0OBBYEFMcMODNu1ePYTjNDZlJ65IB/AvvYME4GA1UdIwRHMEWAFMcMODNu1ePYTjNDZlJ65IB/AvvYoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA6UhwcF6v2RcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAETf8zAraudG4HuRgRQ8u4bGOqwWs6qnwvFHriuF4CvAhuRk1+n8B/c1nnPEytMqJDrG8YfLkkWaxE5XLIgW2Mg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-41.ladok.umu.se:8448/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://nya-41.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8448/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://nya-41.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOlIcHBer9kXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuOZSnPO78gASdSBT+E4z0sJQTy9+6mxGLAmywHtazJgAKYWzf3YmVln1SVNIw/s6eut9WOuDvBlhoJJj0vxG8CAwEAAaN/MH0wHQYDVR0OBBYEFMcMODNu1ePYTjNDZlJ65IB/AvvYME4GA1UdIwRHMEWAFMcMODNu1ePYTjNDZlJ65IB/AvvYoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA6UhwcF6v2RcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAETf8zAraudG4HuRgRQ8u4bGOqwWs6qnwvFHriuF4CvAhuRk1+n8B/c1nnPEytMqJDrG8YfLkkWaxE5XLIgW2Mg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-41.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-41_idp-metadata.xml b/swamid-1.0/nya-41_idp-metadata.xml
index 5d5def00..0b1b1f52 100644
--- a/swamid-1.0/nya-41_idp-metadata.xml
+++ b/swamid-1.0/nya-41_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-41.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-41.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKL/w1UabdTnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMR//D4JOhYvaY2HmZVLFO7PfC6ciMZbuIvKWsNja97EHp4753vPJ7GOZqs50fUHvB6zJYjr6a0R7aJxtrez090CAwEAAaN/MH0wHQYDVR0OBBYEFCAQARq+L1QZok7bOL6j6kjZFHCcME4GA1UdIwRHMEWAFCAQARq+L1QZok7bOL6j6kjZFHCcoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkAov/DVRpt1OcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKtj48V8hyTXIvPRBr5gP6yjEmyanH5Fo3wJVMEzj0Q6OkazP1BzhyMsTlEqWhCVoS0f29RUITZ87H0uNSF8GZU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-41.ladok.umu.se:8452/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://nya-41.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8452/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://nya-41.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKL/w1UabdTnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMR//D4JOhYvaY2HmZVLFO7PfC6ciMZbuIvKWsNja97EHp4753vPJ7GOZqs50fUHvB6zJYjr6a0R7aJxtrez090CAwEAAaN/MH0wHQYDVR0OBBYEFCAQARq+L1QZok7bOL6j6kjZFHCcME4GA1UdIwRHMEWAFCAQARq+L1QZok7bOL6j6kjZFHCcoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkAov/DVRpt1OcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKtj48V8hyTXIvPRBr5gP6yjEmyanH5Fo3wJVMEzj0Q6OkazP1BzhyMsTlEqWhCVoS0f29RUITZ87H0uNSF8GZU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-41.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml
index d504d346..ccfade14 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-42.ladok.umu.se/aws-sp-en">
-
<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://nya-42.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ icUA3oRXGSfcKNiVpOCzf4bzgBNfinbPeaMMgS54xjbaWdTyW0MCzNSmyg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml
index 6917f27a..3a71be4e 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-42.ladok.umu.se/aws-sp">
-
<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://nya-42.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ kASYopu1YC42QWEkkbBmokuwMffcdcFncxoxGzzDp85c3JeIjpe5FdSpBO/BKUMW
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml
index 269bda85..72678476 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-42.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-42.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ0yGCvoITOrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA1WhcNMjIwMjE3MTIxMzA1WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMZRJ6Szfre7vUSUKc50m6SfXFkiIWdaAIL2ZUHNsBc1jMwZ/Sif1E58Osk5d2k4dfq9YU4KF8Ozd2OoohF2oI8CAwEAAaN/MH0wHQYDVR0OBBYEFFtTXtfBAWG3jO6rcj2KCqJ9urQ3ME4GA1UdIwRHMEWAFFtTXtfBAWG3jO6rcj2KCqJ9urQ3oSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkAnTIYK+ghM6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGyowxrDMAAVbJUN2sfycH5WAG6PB4G9OIMGGPyiX52SnjA1LqKs38efMURodMyzSxdKVs7NSlJmLWoCdvl2CvE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-42.ladok.umu.se:8450/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://nya-42.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8450/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://nya-42.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ0yGCvoITOrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA1WhcNMjIwMjE3MTIxMzA1WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMZRJ6Szfre7vUSUKc50m6SfXFkiIWdaAIL2ZUHNsBc1jMwZ/Sif1E58Osk5d2k4dfq9YU4KF8Ozd2OoohF2oI8CAwEAAaN/MH0wHQYDVR0OBBYEFFtTXtfBAWG3jO6rcj2KCqJ9urQ3ME4GA1UdIwRHMEWAFFtTXtfBAWG3jO6rcj2KCqJ9urQ3oSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkAnTIYK+ghM6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGyowxrDMAAVbJUN2sfycH5WAG6PB4G9OIMGGPyiX52SnjA1LqKs38efMURodMyzSxdKVs7NSlJmLWoCdvl2CvE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-42.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml
index 4b49d851..adb6d4d7 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-42.ladok.umu.se/ecs-sp">
-
<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://nya-42.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ oHr4fMXOHMsL8OyM/RrqMW5mc8IOCAQvPNTBrHFndXCxbbeXtqOGww==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml
index 179805b9..0cb12f5e 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-42.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-42.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN2MoNMAeSm1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA2WhcNMjIwMjE3MTIxMzA2WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO9ZY2MHygjGG8EI0xPh78fdkQ24X5aaplXm7LujasXQIItwOrUV7g81HQ6/DzoOcIkfQyyv72wAdFacYDqQhoMCAwEAAaN/MH0wHQYDVR0OBBYEFIoneCaEB0O3uprW1Mvp99a32yPSME4GA1UdIwRHMEWAFIoneCaEB0O3uprW1Mvp99a32yPSoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA3Yyg0wB5KbUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABZLruBz99LJ9HgZwP7kDQa4nwgVKlDFBYp1y2C7C3ibrlWUomtjIAT9Tnsl8sGTfj5IRp6QIsnxPQAjkgma8I8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-42.ladok.umu.se:8448/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://nya-42.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8448/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://nya-42.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN2MoNMAeSm1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA2WhcNMjIwMjE3MTIxMzA2WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO9ZY2MHygjGG8EI0xPh78fdkQ24X5aaplXm7LujasXQIItwOrUV7g81HQ6/DzoOcIkfQyyv72wAdFacYDqQhoMCAwEAAaN/MH0wHQYDVR0OBBYEFIoneCaEB0O3uprW1Mvp99a32yPSME4GA1UdIwRHMEWAFIoneCaEB0O3uprW1Mvp99a32yPSoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA3Yyg0wB5KbUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABZLruBz99LJ9HgZwP7kDQa4nwgVKlDFBYp1y2C7C3ibrlWUomtjIAT9Tnsl8sGTfj5IRp6QIsnxPQAjkgma8I8=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-42.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-42_idp-metadata.xml b/swamid-1.0/nya-42_idp-metadata.xml
index 400e2e02..e642cb46 100644
--- a/swamid-1.0/nya-42_idp-metadata.xml
+++ b/swamid-1.0/nya-42_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-42.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-42.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO0sRD/nJOjiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALpztlstjf9qCZ5wO0p08p4iCY0I6Vgm6kKBmqLeubThh4OYz0sX3rGVAYeNZRwhaeGLiz4VGfSBhxYG5GaHBBUCAwEAAaN/MH0wHQYDVR0OBBYEFG49b0VuEg49wM91m1OYu64KXHtPME4GA1UdIwRHMEWAFG49b0VuEg49wM91m1OYu64KXHtPoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA7SxEP+ck6OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABocDQGudwgskFiVUjs5vLUMc43XRj1ERPj6RPJw9XUDftSiav8mYDeqIw2cICoD0HKXWK5ebRyOEOj2GuuOKo0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-42.ladok.umu.se:8452/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://nya-42.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8452/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://nya-42.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAO0sRD/nJOjiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALpztlstjf9qCZ5wO0p08p4iCY0I6Vgm6kKBmqLeubThh4OYz0sX3rGVAYeNZRwhaeGLiz4VGfSBhxYG5GaHBBUCAwEAAaN/MH0wHQYDVR0OBBYEFG49b0VuEg49wM91m1OYu64KXHtPME4GA1UdIwRHMEWAFG49b0VuEg49wM91m1OYu64KXHtPoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA7SxEP+ck6OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABocDQGudwgskFiVUjs5vLUMc43XRj1ERPj6RPJw9XUDftSiav8mYDeqIw2cICoD0HKXWK5ebRyOEOj2GuuOKo0=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-42.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml
index 8d1dee9b..c379faa1 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-43.ladok.umu.se/aws-sp-en">
-
<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://nya-43.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Qk4TWq1KXxxg0O/3jwNuOIN/UiOJhstNsOT8zEBsPAdGsrcsM4j1+kSEWQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml
index 4e080d01..aa06d2b1 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-43.ladok.umu.se/aws-sp">
-
<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://nya-43.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ zNDBdRUT+W98qJsXKqTDiHE3ocuYXcy++jEb0Vh0rpMS3VcDXkhEpA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml
index cd4cd4e5..5f8a0a23 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-43.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-43.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ6doJWCMqbLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE1WhcNMjIwMjE3MTIxMzE1WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9EZ/kE75zTo9XbcFt6/3nfo++MbtDsFx67sZE9UUpan7D09276+Hz1wWppWthcaNhTWu6TnDgtqljpmKhsCqsCAwEAAaN/MH0wHQYDVR0OBBYEFEF5jvPXMcrGM0QhXuCNOWKgwXQWME4GA1UdIwRHMEWAFEF5jvPXMcrGM0QhXuCNOWKgwXQWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAnp2glYIypsswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhotXbvDC92vbkA0ltT55t0vpvK6mI21yfBkKxzdT7OLs3+6woIq86c2eTqrhF9yMJlvsca3chu93b9oYDY/6w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-43.ladok.umu.se:8450/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://nya-43.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8450/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://nya-43.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJ6doJWCMqbLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE1WhcNMjIwMjE3MTIxMzE1WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9EZ/kE75zTo9XbcFt6/3nfo++MbtDsFx67sZE9UUpan7D09276+Hz1wWppWthcaNhTWu6TnDgtqljpmKhsCqsCAwEAAaN/MH0wHQYDVR0OBBYEFEF5jvPXMcrGM0QhXuCNOWKgwXQWME4GA1UdIwRHMEWAFEF5jvPXMcrGM0QhXuCNOWKgwXQWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAnp2glYIypsswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhotXbvDC92vbkA0ltT55t0vpvK6mI21yfBkKxzdT7OLs3+6woIq86c2eTqrhF9yMJlvsca3chu93b9oYDY/6w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-43.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml
index 83b748f7..3ea0c913 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-43.ladok.umu.se/ecs-sp">
-
<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://nya-43.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ X811ZEKFXoeiSvbKSZjWlQ2Eob+X8zjv5jPD5iYqgkGPh4zHbOLAOGja2wqFQApm
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml
index 1c0dd5c7..c54a0152 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-43.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-43.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJuE84z6RBOFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE2WhcNMjIwMjE3MTIxMzE2WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfaSEjacLKstuHfk5y4IuCCuebZjix8G2sFuG0rP6qNPpA0mgoNfn5wmXSmtQx58HxdQIf3xycVeCkYX8bwxikCAwEAAaN/MH0wHQYDVR0OBBYEFKu8yOVKH0oSonrBWACWhAHXnAuAME4GA1UdIwRHMEWAFKu8yOVKH0oSonrBWACWhAHXnAuAoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAm4TzjPpEE4UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKsXZdTjM/jWFh/SegFsQHkp31CLfmHHIZ5CTYE5V+1giWgDQmiIvr5pRvMgHQIai15dffxoq2rPPl5mpb07iVQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-43.ladok.umu.se:8448/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://nya-43.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8448/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://nya-43.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJuE84z6RBOFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE2WhcNMjIwMjE3MTIxMzE2WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfaSEjacLKstuHfk5y4IuCCuebZjix8G2sFuG0rP6qNPpA0mgoNfn5wmXSmtQx58HxdQIf3xycVeCkYX8bwxikCAwEAAaN/MH0wHQYDVR0OBBYEFKu8yOVKH0oSonrBWACWhAHXnAuAME4GA1UdIwRHMEWAFKu8yOVKH0oSonrBWACWhAHXnAuAoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAm4TzjPpEE4UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKsXZdTjM/jWFh/SegFsQHkp31CLfmHHIZ5CTYE5V+1giWgDQmiIvr5pRvMgHQIai15dffxoq2rPPl5mpb07iVQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-43.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-43_idp-metadata.xml b/swamid-1.0/nya-43_idp-metadata.xml
index 6703ee1b..76aa8a57 100644
--- a/swamid-1.0/nya-43_idp-metadata.xml
+++ b/swamid-1.0/nya-43_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-43.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-43.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALdu0Jo7ZCEGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJhciAtL3YtCXvZaygjtqVIeEAdGl4w6mP9psXtPV4JOd0J6PdjCkLUszEBME3oMEHcB++3Hjetey43aduS5zLECAwEAAaN/MH0wHQYDVR0OBBYEFFYVIrJjsh5QcABLmEnRLoB5FuoWME4GA1UdIwRHMEWAFFYVIrJjsh5QcABLmEnRLoB5FuoWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAt27QmjtkIQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE9cybFyOn2f8wQKnpf5NWo9WDltDh9aLoCw6Vj6zLHrO1sXhcRPcsB8nbUJ+Mpl8fh19ERYvpDWNzlNYipS5EU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-43.ladok.umu.se:8452/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://nya-43.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8452/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://nya-43.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALdu0Jo7ZCEGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJhciAtL3YtCXvZaygjtqVIeEAdGl4w6mP9psXtPV4JOd0J6PdjCkLUszEBME3oMEHcB++3Hjetey43aduS5zLECAwEAAaN/MH0wHQYDVR0OBBYEFFYVIrJjsh5QcABLmEnRLoB5FuoWME4GA1UdIwRHMEWAFFYVIrJjsh5QcABLmEnRLoB5FuoWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAt27QmjtkIQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE9cybFyOn2f8wQKnpf5NWo9WDltDh9aLoCw6Vj6zLHrO1sXhcRPcsB8nbUJ+Mpl8fh19ERYvpDWNzlNYipS5EU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-43.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml
index dbddd39a..17682d47 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-44.ladok.umu.se/aws-sp-en">
-
<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://nya-44.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ aelVb0hk4jhW0bdZYAr/CHx9Cz6CYCNOrToU2ugV0clcsYsMhxsMxCqX0A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml
index 5fcc0b17..3ec1e6ea 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-44.ladok.umu.se/aws-sp">
-
<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://nya-44.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ vXeMKvyNMBXQVNfr0PyInZZjKzNtAMsCL50dpJ3B7ucR1iIzJRBZIJo4IdA1tKUf
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml
index 953ac351..315db662 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-44.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-44.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANVcfUG+C/8mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIwWhcNMjIwMjE3MTIxMzIwWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALF7V1OAwQx7BmdJYpwuUyj96k87cH8RJxs+IU2l6vUADgvIQO7lTO5CjnboqR33YeED4sfMBLvqwV05cmicKr8CAwEAAaN/MH0wHQYDVR0OBBYEFFeUYrIYLRwBGy+iniCS4g5vFgFPME4GA1UdIwRHMEWAFFeUYrIYLRwBGy+iniCS4g5vFgFPoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA1Vx9Qb4L/yYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALEPlOmeCxwnVNKG/sl4u8JCs6itERTL3EKCacyuYhcp1aUX7SvqcN0o6FIfZ6d2Or3l6smb0wt6YUnFOZbPu6o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-44.ladok.umu.se:8450/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://nya-44.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8450/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://nya-44.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANVcfUG+C/8mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIwWhcNMjIwMjE3MTIxMzIwWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALF7V1OAwQx7BmdJYpwuUyj96k87cH8RJxs+IU2l6vUADgvIQO7lTO5CjnboqR33YeED4sfMBLvqwV05cmicKr8CAwEAAaN/MH0wHQYDVR0OBBYEFFeUYrIYLRwBGy+iniCS4g5vFgFPME4GA1UdIwRHMEWAFFeUYrIYLRwBGy+iniCS4g5vFgFPoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA1Vx9Qb4L/yYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALEPlOmeCxwnVNKG/sl4u8JCs6itERTL3EKCacyuYhcp1aUX7SvqcN0o6FIfZ6d2Or3l6smb0wt6YUnFOZbPu6o=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-44.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml
index 8e89c87d..e4dafaa7 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-44.ladok.umu.se/ecs-sp">
-
<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://nya-44.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ gk/xy7OaTwrFd1Arkk6GcLXD60PP6qkSpUKy/YKDvRv52fqkxFw1AQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml
index c3d50c98..679d54fa 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-44.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-44.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALwfXjfk0+IzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIxWhcNMjIwMjE3MTIxMzIxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANT59hgfc21cCarnU5qExSXv70LJoK+r1sK9MATR42nh+G/MUq/n/BnErYy8jaT5YWT+oLF2r1soVhMtXq3N3AcCAwEAAaN/MH0wHQYDVR0OBBYEFHvSI4KjZoUUcW5dxn5sgTKZE+lUME4GA1UdIwRHMEWAFHvSI4KjZoUUcW5dxn5sgTKZE+lUoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkAvB9eN+TT4jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMjahxltSae7qIDxwqZENTQ6ln0U83hMaYWffgUffdU/MN9tECJ/kzBmW3XMWzEU6E9qk2pTAm3znFrdNjJ+vgs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-44.ladok.umu.se:8448/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://nya-44.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8448/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://nya-44.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALwfXjfk0+IzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIxWhcNMjIwMjE3MTIxMzIxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANT59hgfc21cCarnU5qExSXv70LJoK+r1sK9MATR42nh+G/MUq/n/BnErYy8jaT5YWT+oLF2r1soVhMtXq3N3AcCAwEAAaN/MH0wHQYDVR0OBBYEFHvSI4KjZoUUcW5dxn5sgTKZE+lUME4GA1UdIwRHMEWAFHvSI4KjZoUUcW5dxn5sgTKZE+lUoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkAvB9eN+TT4jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMjahxltSae7qIDxwqZENTQ6ln0U83hMaYWffgUffdU/MN9tECJ/kzBmW3XMWzEU6E9qk2pTAm3znFrdNjJ+vgs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-44.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-44_idp-metadata.xml b/swamid-1.0/nya-44_idp-metadata.xml
index 99dc48cd..3219b227 100644
--- a/swamid-1.0/nya-44_idp-metadata.xml
+++ b/swamid-1.0/nya-44_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-44.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-44.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN9dhhAV/cp2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM2ESfeAyrpMhCniantsxC+CrJLURsUaojWa29wEbS1yoCCIte5Jzme7q8wjmHGTgXDRBSecdey3FXUAkbrve0CAwEAAaN/MH0wHQYDVR0OBBYEFOG5sjrD1YJqFY1Sokjm45hC5cleME4GA1UdIwRHMEWAFOG5sjrD1YJqFY1Sokjm45hC5cleoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA312GEBX9ynYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJByL0c/44B0iJAj2tftyI7eggsYhu3bvcUo0BiFpglrysDSVX+BGssuXFxd3ND0YRXO9IWS4+CvL2DtVmFeFVM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-44.ladok.umu.se:8452/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://nya-44.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8452/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://nya-44.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAN9dhhAV/cp2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM2ESfeAyrpMhCniantsxC+CrJLURsUaojWa29wEbS1yoCCIte5Jzme7q8wjmHGTgXDRBSecdey3FXUAkbrve0CAwEAAaN/MH0wHQYDVR0OBBYEFOG5sjrD1YJqFY1Sokjm45hC5cleME4GA1UdIwRHMEWAFOG5sjrD1YJqFY1Sokjm45hC5cleoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA312GEBX9ynYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJByL0c/44B0iJAj2tftyI7eggsYhu3bvcUo0BiFpglrysDSVX+BGssuXFxd3ND0YRXO9IWS4+CvL2DtVmFeFVM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-44.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml
index a441dbee..fe19bf30 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-45.ladok.umu.se/aws-sp-en">
-
<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://nya-45.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ hLfWHWKd91WRCQK8H/VL+DOgKp0NaRyOp4/0SIR2xMmWuBJWNSJB7lO23Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml
index 2bba35a5..ffaf19ee 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-45.ladok.umu.se/aws-sp">
-
<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://nya-45.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ lnsmoWPkGb3xFK4yyL58Jhv5tEJ0B4b/6whBdbLl8SW4rlCIaJQ0pg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml
index b9ea0dd6..1a05758a 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-45.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-45.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALg74gzz4671MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI2WhcNMjIwMjE3MTIxMzI2WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOZX90qy1v4kXDBsK37WmpBT5ItPB5qPc0I6+YkOTDZGQQPbT/ds9zD+FTOKBYlv4wt+iLpifZwEcl+fR3m+vpkCAwEAAaN/MH0wHQYDVR0OBBYEFMPABpWQI1Z3f6QPyPcmvJNDOAurME4GA1UdIwRHMEWAFMPABpWQI1Z3f6QPyPcmvJNDOAuroSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAuDviDPPjrvUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIEZ5DnqsO8aEkK0adgD533Brgn++YcNF87DqC3RmfF8Qp61eoMHoGzAr26YXs14e7iDZmYze16Fv1jJR68PJIo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-45.ladok.umu.se:8450/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://nya-45.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8450/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://nya-45.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALg74gzz4671MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI2WhcNMjIwMjE3MTIxMzI2WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOZX90qy1v4kXDBsK37WmpBT5ItPB5qPc0I6+YkOTDZGQQPbT/ds9zD+FTOKBYlv4wt+iLpifZwEcl+fR3m+vpkCAwEAAaN/MH0wHQYDVR0OBBYEFMPABpWQI1Z3f6QPyPcmvJNDOAurME4GA1UdIwRHMEWAFMPABpWQI1Z3f6QPyPcmvJNDOAuroSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAuDviDPPjrvUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIEZ5DnqsO8aEkK0adgD533Brgn++YcNF87DqC3RmfF8Qp61eoMHoGzAr26YXs14e7iDZmYze16Fv1jJR68PJIo=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-45.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml
index 3f91ef90..237e5a37 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-45.ladok.umu.se/ecs-sp">
-
<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://nya-45.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Grxp3KVv2oUFE+xa7MU9hkRO9sT00gQkiyJaOBw31mUPPkncGA9fsUa/z4ODnpqn
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml
index e5754ce4..75973fe7 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-45.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-45.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMk57tr9xfmGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI3WhcNMjIwMjE3MTIxMzI3WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjOyqjobvbTrvnfIt5+I55vP8CcXN4ejrR928DTqJ+IqKvklBQfA8siM/RUpADYgr3TmZpO9nCZwvcoeyFoQF8CAwEAAaN/MH0wHQYDVR0OBBYEFO5ddZJxjdhW3ET4gx0pz5NWCiLnME4GA1UdIwRHMEWAFO5ddZJxjdhW3ET4gx0pz5NWCiLnoSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAyTnu2v3F+YYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEYavcn0byvRiY+jqvb1Dz+rnZxTFuu5FZKOwfYQ8o81DnG+KzAOXgyR/sPn/YYEd7MLZrWDVqrZ0GnlvJyC12Y=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-45.ladok.umu.se:8448/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://nya-45.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8448/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://nya-45.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAMk57tr9xfmGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI3WhcNMjIwMjE3MTIxMzI3WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjOyqjobvbTrvnfIt5+I55vP8CcXN4ejrR928DTqJ+IqKvklBQfA8siM/RUpADYgr3TmZpO9nCZwvcoeyFoQF8CAwEAAaN/MH0wHQYDVR0OBBYEFO5ddZJxjdhW3ET4gx0pz5NWCiLnME4GA1UdIwRHMEWAFO5ddZJxjdhW3ET4gx0pz5NWCiLnoSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAyTnu2v3F+YYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEYavcn0byvRiY+jqvb1Dz+rnZxTFuu5FZKOwfYQ8o81DnG+KzAOXgyR/sPn/YYEd7MLZrWDVqrZ0GnlvJyC12Y=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-45.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-45_idp-metadata.xml b/swamid-1.0/nya-45_idp-metadata.xml
index 629bc02f..b74efc3a 100644
--- a/swamid-1.0/nya-45_idp-metadata.xml
+++ b/swamid-1.0/nya-45_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-45.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-45.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL4Yd/EGr0TUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKrP/C2GSY7s2azjHGU8Ki1mVT/FIb3Ski/p0HuD6JdO0KxIJdZyRM4iqIrOhB2OOiaxtDWfAoW3CftFaNUSlVsCAwEAAaN/MH0wHQYDVR0OBBYEFLtHaoaR3d61fhqe1XRPw4uFbpm+ME4GA1UdIwRHMEWAFLtHaoaR3d61fhqe1XRPw4uFbpm+oSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAvhh38QavRNQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHXA8ERtCTcj12BvU5BO4ePfidSQ457HcpStHWRCIFV3PAdt4lpLjy9m6jdAqi6cjCsWVO/zv65Jlf9226ZAW6w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-45.ladok.umu.se:8452/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://nya-45.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8452/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://nya-45.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL4Yd/EGr0TUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKrP/C2GSY7s2azjHGU8Ki1mVT/FIb3Ski/p0HuD6JdO0KxIJdZyRM4iqIrOhB2OOiaxtDWfAoW3CftFaNUSlVsCAwEAAaN/MH0wHQYDVR0OBBYEFLtHaoaR3d61fhqe1XRPw4uFbpm+ME4GA1UdIwRHMEWAFLtHaoaR3d61fhqe1XRPw4uFbpm+oSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAvhh38QavRNQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHXA8ERtCTcj12BvU5BO4ePfidSQ457HcpStHWRCIFV3PAdt4lpLjy9m6jdAqi6cjCsWVO/zv65Jlf9226ZAW6w=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-45.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml
index 6b360eb7..7aa49000 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-46.ladok.umu.se/aws-sp-en">
-
<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://nya-46.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ v8UaZ9Dp5IXg/og1Fosd+aZelwoHO3qbYGZl+aU9HHls5xBVnzj6sJ9VETUEzSZ9
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml
index b8335940..ff720d21 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-46.ladok.umu.se/aws-sp">
-
<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://nya-46.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ pfhKki7x3ATaNm86Fq5K61gZLxXksKUmnY045ltykQd0QfGu3etpKA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml
index e99650dd..6c8361ab 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-46.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-46.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL0OziKlzh3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMyWhcNMjIwMjE3MTIxMzMyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALStdDog2qahXDvyBsuNTXoh+Q/85I3+5kp4EvuwFDGM6SQR4oKUr1dCntcWYlOjJ8yRK6didzbDDS2xfy1ypdsCAwEAAaN/MH0wHQYDVR0OBBYEFC34djHaK05zUr/Nczplupjjg4fPME4GA1UdIwRHMEWAFC34djHaK05zUr/Nczplupjjg4fPoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAvQ7OIqXOHeMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJnX2GL+1ojc/z1Mqdx48F/u6GucM8VcxDG3HRZJsSf76JEqkQzr20r2nhruHrqKvHwbKmJNa2I5xgLW1vYe6Zs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-46.ladok.umu.se:8450/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://nya-46.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8450/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://nya-46.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAL0OziKlzh3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMyWhcNMjIwMjE3MTIxMzMyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALStdDog2qahXDvyBsuNTXoh+Q/85I3+5kp4EvuwFDGM6SQR4oKUr1dCntcWYlOjJ8yRK6didzbDDS2xfy1ypdsCAwEAAaN/MH0wHQYDVR0OBBYEFC34djHaK05zUr/Nczplupjjg4fPME4GA1UdIwRHMEWAFC34djHaK05zUr/Nczplupjjg4fPoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAvQ7OIqXOHeMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJnX2GL+1ojc/z1Mqdx48F/u6GucM8VcxDG3HRZJsSf76JEqkQzr20r2nhruHrqKvHwbKmJNa2I5xgLW1vYe6Zs=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-46.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml
index 78ce8454..f8db382a 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-46.ladok.umu.se/ecs-sp">
-
<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://nya-46.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ e6mLkRjJrQyNp3oDfgGtEOZCT0glnLE/UEDSdyR8BxCq7cqJcPn/DQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml
index 7663e1da..5d231eb2 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-46.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-46.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJBu02qdDvxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMzWhcNMjIwMjE3MTIxMzMzWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALU06fqLxdKS8fX/VZRDWV70M3rl4bI/tE/M77/QtGOctX4jhv0RbO+S7MDPIk43iRvIim4e3fmWs/wilp7QjnsCAwEAAaN/MH0wHQYDVR0OBBYEFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHME4GA1UdIwRHMEWAFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAkG7Tap0O/GUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpjV+IB5yGSWwvBS/k0Scix4HYA/dPph9Nss7aGuRZuEffJFOqSaKl/utboBnO6rN2tPatPFvffoFe7G4kFZsg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-46.ladok.umu.se:8448/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://nya-46.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8448/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://nya-46.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAJBu02qdDvxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMzWhcNMjIwMjE3MTIxMzMzWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALU06fqLxdKS8fX/VZRDWV70M3rl4bI/tE/M77/QtGOctX4jhv0RbO+S7MDPIk43iRvIim4e3fmWs/wilp7QjnsCAwEAAaN/MH0wHQYDVR0OBBYEFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHME4GA1UdIwRHMEWAFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAkG7Tap0O/GUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpjV+IB5yGSWwvBS/k0Scix4HYA/dPph9Nss7aGuRZuEffJFOqSaKl/utboBnO6rN2tPatPFvffoFe7G4kFZsg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-46.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-46_idp-metadata.xml b/swamid-1.0/nya-46_idp-metadata.xml
index e924a93b..a9b45f36 100644
--- a/swamid-1.0/nya-46_idp-metadata.xml
+++ b/swamid-1.0/nya-46_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-46.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-46.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIXUG6HnN+HLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMutpFTCHHKHcvqMuGEkn1tx4SKGBf7lf33s8xC2gUqjZSIm2H/pwyImMsD6qq0doEwn9sX5TumRRxdAI81dSTECAwEAAaN/MH0wHQYDVR0OBBYEFD8JekhbqpJnFcmEAaEbU5HMaTgoME4GA1UdIwRHMEWAFD8JekhbqpJnFcmEAaEbU5HMaTgooSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAhdQboec34cswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGfh3JizTtmHddHTO0joa/Z4NghihMXs2U9T8aE0D7qneG3RGxMPFlhM/7OlHVbgFv82zSQUgGW9uxs/n9Z6ra4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-46.ladok.umu.se:8452/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://nya-46.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8452/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://nya-46.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIXUG6HnN+HLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMutpFTCHHKHcvqMuGEkn1tx4SKGBf7lf33s8xC2gUqjZSIm2H/pwyImMsD6qq0doEwn9sX5TumRRxdAI81dSTECAwEAAaN/MH0wHQYDVR0OBBYEFD8JekhbqpJnFcmEAaEbU5HMaTgoME4GA1UdIwRHMEWAFD8JekhbqpJnFcmEAaEbU5HMaTgooSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAhdQboec34cswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGfh3JizTtmHddHTO0joa/Z4NghihMXs2U9T8aE0D7qneG3RGxMPFlhM/7OlHVbgFv82zSQUgGW9uxs/n9Z6ra4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-46.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml
index f33125df..07399a72 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-47.ladok.umu.se/aws-sp-en">
-
<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://nya-47.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ I2/OAhnrp/0L0n3N/m7ywJxCBKFwpq8GJHfapLKEavPl/nf1bh29PRuxTg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml
index 72f17d35..97d417cd 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-47.ladok.umu.se/aws-sp">
-
<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://nya-47.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ c9CXZ8Aa7kzLHFfet0Cn308DR7TW7whq7j/Em1ehhCrHAu0kcfOfjA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml
index 3c0e4afc..ef0d559f 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-47.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-47.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOMAoTWEE9PgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQkuSp05wjdn/dC51u1PLrcamD/nfPJ2TRecl9odZt9Ii7FPF5FNmldU36/O0zS3TC10D3k3yfoeZj/dBXpd8kCAwEAAaN/MH0wHQYDVR0OBBYEFHTbawbG7xoVTPiiFy2YI2ry265LME4GA1UdIwRHMEWAFHTbawbG7xoVTPiiFy2YI2ry265LoSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA4wChNYQT0+AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGP1ucEREVCDmgcnTymWVYdYBJ2ET1t9hpcoobjF9cW/ALUjvd4fsUdETuW9XYmTmOQcn1HWTx5KPy6WFgfpN/s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-47.ladok.umu.se:8450/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://nya-47.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8450/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://nya-47.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAOMAoTWEE9PgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQkuSp05wjdn/dC51u1PLrcamD/nfPJ2TRecl9odZt9Ii7FPF5FNmldU36/O0zS3TC10D3k3yfoeZj/dBXpd8kCAwEAAaN/MH0wHQYDVR0OBBYEFHTbawbG7xoVTPiiFy2YI2ry265LME4GA1UdIwRHMEWAFHTbawbG7xoVTPiiFy2YI2ry265LoSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA4wChNYQT0+AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGP1ucEREVCDmgcnTymWVYdYBJ2ET1t9hpcoobjF9cW/ALUjvd4fsUdETuW9XYmTmOQcn1HWTx5KPy6WFgfpN/s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-47.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml
index e89096d2..4751d04b 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-47.ladok.umu.se/ecs-sp">
-
<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://nya-47.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ W1uPnkV9H3icc1ogBJM9aqATomWj6mkqORkYqtkEBY2KlHcFxL9NrA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml
index b7c1e7b5..87bb4da7 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-47.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-47.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANZMnm5U5tYcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3tXZYX2F0j1jZaFwp4zpAJEGzQlNpn2mWzCUqZf93/1Y94rWkOGpniljNRq4mmfRtXxVqoSLW22LDd9fGaodMCAwEAAaN/MH0wHQYDVR0OBBYEFCuNtxi/KQBDYl6NX9HuZhM6dNV2ME4GA1UdIwRHMEWAFCuNtxi/KQBDYl6NX9HuZhM6dNV2oSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA1kyeblTm1hwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHHv7ApXM2vi4yOpFMe7mdpM4jE9w5BdDL7OYfYVj2ox6QtsA6m0guGWY//yqpLJmVKstuxEpycioX7P011AiLU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-47.ladok.umu.se:8448/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://nya-47.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8448/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://nya-47.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJANZMnm5U5tYcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3tXZYX2F0j1jZaFwp4zpAJEGzQlNpn2mWzCUqZf93/1Y94rWkOGpniljNRq4mmfRtXxVqoSLW22LDd9fGaodMCAwEAAaN/MH0wHQYDVR0OBBYEFCuNtxi/KQBDYl6NX9HuZhM6dNV2ME4GA1UdIwRHMEWAFCuNtxi/KQBDYl6NX9HuZhM6dNV2oSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA1kyeblTm1hwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHHv7ApXM2vi4yOpFMe7mdpM4jE9w5BdDL7OYfYVj2ox6QtsA6m0guGWY//yqpLJmVKstuxEpycioX7P011AiLU=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-47.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-47_idp-metadata.xml b/swamid-1.0/nya-47_idp-metadata.xml
index b28557b4..f01eb53c 100644
--- a/swamid-1.0/nya-47_idp-metadata.xml
+++ b/swamid-1.0/nya-47_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-47.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-47.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKept7+35fccMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMtwKQtgKkcYquUihzXIxQvlkdEj4u3OZuIdHpIf9CX3RaroJppz5wvuhFAI01EAhS3fnQCN7TUn3wR0QfzNa90CAwEAAaN/MH0wHQYDVR0OBBYEFNAEfnGAtql74mFfW5Vthnt/ST3wME4GA1UdIwRHMEWAFNAEfnGAtql74mFfW5Vthnt/ST3woSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkAp6m3v7fl9xwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/KBGdR8PfjAE7G6m05v5MnG5HK+tyF8BRvXT1LW3gw7NiZrqou684LHg4W2ySdFZ2fmCa+yxFv+4wk7TvJKY4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-47.ladok.umu.se:8452/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://nya-47.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8452/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://nya-47.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAKept7+35fccMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMtwKQtgKkcYquUihzXIxQvlkdEj4u3OZuIdHpIf9CX3RaroJppz5wvuhFAI01EAhS3fnQCN7TUn3wR0QfzNa90CAwEAAaN/MH0wHQYDVR0OBBYEFNAEfnGAtql74mFfW5Vthnt/ST3wME4GA1UdIwRHMEWAFNAEfnGAtql74mFfW5Vthnt/ST3woSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkAp6m3v7fl9xwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/KBGdR8PfjAE7G6m05v5MnG5HK+tyF8BRvXT1LW3gw7NiZrqou684LHg4W2ySdFZ2fmCa+yxFv+4wk7TvJKY4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-47.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml
index bc52ccd0..e5662104 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/aws-sp-en">
-
<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://nya-48.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Ld+xpeD/skZA/APgHC4KyHTCFax4Bef7uRlKqxjhtnbjJgnBaduKEc4OgA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml
index 76c21398..bb8349b0 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/aws-sp">
-
<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://nya-48.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ kWqPs+n25jgxp6Rbs63uGOob5czQrPhJ/ZH5T7pdJ8TDTZZwAiYMJ8uqMfsygtJO
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml
index c131eb1c..de8bb02d 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-48.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-48.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM/aZohEdcZdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUKO60cP/Nl0D4G6NRxZ9eAYbB9pXap2WPkRbQ1lw2OA2Z3ZY6939qlKG/1US1yuW1dfoznjUR2Fi0SMLi5DNkCAwEAAaN/MH0wHQYDVR0OBBYEFA2RbWgGfzaFcWNUF+cURUUXtGTYME4GA1UdIwRHMEWAFA2RbWgGfzaFcWNUF+cURUUXtGTYoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAz9pmiER1xl0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEDJxwunhPwJtj1fGMENqlN40hPSxz82BaQwJTjcnRn0O5LqLX/LN4sO2IVtcNVf3TZFt+fP1wB7ZftmxyXL2Xg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-48.ladok.umu.se:8450/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://nya-48.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8450/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://nya-48.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM/aZohEdcZdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUKO60cP/Nl0D4G6NRxZ9eAYbB9pXap2WPkRbQ1lw2OA2Z3ZY6939qlKG/1US1yuW1dfoznjUR2Fi0SMLi5DNkCAwEAAaN/MH0wHQYDVR0OBBYEFA2RbWgGfzaFcWNUF+cURUUXtGTYME4GA1UdIwRHMEWAFA2RbWgGfzaFcWNUF+cURUUXtGTYoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAz9pmiER1xl0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEDJxwunhPwJtj1fGMENqlN40hPSxz82BaQwJTjcnRn0O5LqLX/LN4sO2IVtcNVf3TZFt+fP1wB7ZftmxyXL2Xg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-48.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml
index 1df29d5c..82f13363 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/ecs-sp">
-
<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://nya-48.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ xpwu1BXpAzhSvrSWzn05rfqCc1IGOT4sTSv99GRgYU0464GidHpmUg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml
index 733406d0..9ff9a772 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-48.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-48.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALbMbSXqkcrGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK3dJ30wOwhJ1GrhYbDeZwESo2rIVte3K7jSi5tyB6kpFJA4zHdMGfEpucd6+4/TuYOsQ24c0W2Kmib+jGrUWJsCAwEAAaN/MH0wHQYDVR0OBBYEFPRKzkvPOA1k6P1RhcrJ6Tsw+42OME4GA1UdIwRHMEWAFPRKzkvPOA1k6P1RhcrJ6Tsw+42OoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAtsxtJeqRysYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKvzcNMrWaVM15OdUNh48BxlHg7amcRTbL7MPPV79bhwH5bw/U1ax+Zm0Tm64cfOe4trQ5o6WeIarBgr1DHp7pA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-48.ladok.umu.se:8448/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://nya-48.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8448/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://nya-48.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALbMbSXqkcrGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK3dJ30wOwhJ1GrhYbDeZwESo2rIVte3K7jSi5tyB6kpFJA4zHdMGfEpucd6+4/TuYOsQ24c0W2Kmib+jGrUWJsCAwEAAaN/MH0wHQYDVR0OBBYEFPRKzkvPOA1k6P1RhcrJ6Tsw+42OME4GA1UdIwRHMEWAFPRKzkvPOA1k6P1RhcrJ6Tsw+42OoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAtsxtJeqRysYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKvzcNMrWaVM15OdUNh48BxlHg7amcRTbL7MPPV79bhwH5bw/U1ax+Zm0Tm64cfOe4trQ5o6WeIarBgr1DHp7pA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-48.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-48_idp-metadata.xml b/swamid-1.0/nya-48_idp-metadata.xml
index fa72ab48..44f92390 100644
--- a/swamid-1.0/nya-48_idp-metadata.xml
+++ b/swamid-1.0/nya-48_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-48.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-48.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK4CesQMej4iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKN0yh4oYAeUlrS9CBN4dTmD+EQtgmLM/lk+++mmE8W1lwLBcCJP+89PclOvkr9clfAXInYhFj8oshiJoPOahIsCAwEAAaN/MH0wHQYDVR0OBBYEFNneqaFS8mk6PBKYpUuPiLsQVdf8ME4GA1UdIwRHMEWAFNneqaFS8mk6PBKYpUuPiLsQVdf8oSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkArgJ6xAx6PiIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKJcnNK3yPpC6IbJTBuxYNn70Gj5bx9OuADFVI7nJ2Cl+i9yq1Ork6PiVsJeU3UEQYePxJm1RIee8um7aKC7ZcQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-48.ladok.umu.se:8452/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://nya-48.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8452/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://nya-48.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAK4CesQMej4iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKN0yh4oYAeUlrS9CBN4dTmD+EQtgmLM/lk+++mmE8W1lwLBcCJP+89PclOvkr9clfAXInYhFj8oshiJoPOahIsCAwEAAaN/MH0wHQYDVR0OBBYEFNneqaFS8mk6PBKYpUuPiLsQVdf8ME4GA1UdIwRHMEWAFNneqaFS8mk6PBKYpUuPiLsQVdf8oSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkArgJ6xAx6PiIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKJcnNK3yPpC6IbJTBuxYNn70Gj5bx9OuADFVI7nJ2Cl+i9yq1Ork6PiVsJeU3UEQYePxJm1RIee8um7aKC7ZcQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-48.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml
index 8944f8ae..a23a8ca9 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-49.ladok.umu.se/aws-sp-en">
-
<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://nya-49.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ fwKWX/V4dW005rkbR3nkIWPvWsYSDuFTVfe2jOmiKU8UkiW1ZyPllyxg6g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml
index a8cf616d..4b67f8c8 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-49.ladok.umu.se/aws-sp">
-
<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://nya-49.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ g2ZlkUDD0v0pz63tjTuCMjRidOOLjhMJOl7z0wj/fArFamDK/Fgw6g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml
index 5e0e9278..ca21ec68 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-49.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-49.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIDsENK6N+CeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU3WhcNMjIwMjE3MTIxMzU3WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALyet17pZLEtrQ56CQBKa5X5+HL0DNUpujW539n9hq2VixalZDKC5gIpi9xegnFoZyPNydJtVr1la6hyd1bdJJECAwEAAaN/MH0wHQYDVR0OBBYEFNvEhMBzsmZl06knJHtoLHnwVzQlME4GA1UdIwRHMEWAFNvEhMBzsmZl06knJHtoLHnwVzQloSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAgOwQ0ro34J4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABqTTVm8Xb7qJaua41aAqlewFNX00R1LVx/HN3KokiuvvCDGbH2IaKrlLTxASNTzltZd2x9fxlrkvXd8xZmxaLc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-49.ladok.umu.se:8450/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://nya-49.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8450/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://nya-49.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAIDsENK6N+CeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU3WhcNMjIwMjE3MTIxMzU3WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALyet17pZLEtrQ56CQBKa5X5+HL0DNUpujW539n9hq2VixalZDKC5gIpi9xegnFoZyPNydJtVr1la6hyd1bdJJECAwEAAaN/MH0wHQYDVR0OBBYEFNvEhMBzsmZl06knJHtoLHnwVzQlME4GA1UdIwRHMEWAFNvEhMBzsmZl06knJHtoLHnwVzQloSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAgOwQ0ro34J4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABqTTVm8Xb7qJaua41aAqlewFNX00R1LVx/HN3KokiuvvCDGbH2IaKrlLTxASNTzltZd2x9fxlrkvXd8xZmxaLc=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-49.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml
index 0477728d..30d0368d 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-49.ladok.umu.se/ecs-sp">
-
<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://nya-49.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ wqJdwlaNHBJYQM/bE57IEQo+w6ImS+vTRmv4jFpd0UkiiqSlQ1DKRw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml
index 9ca09950..d949ab96 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-49.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-49.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP7V6pEegm05MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU4WhcNMjIwMjE3MTIxMzU4WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPYuZlahlEeh1/3xCQuWkNeinm/ZZFsHSBBeb5rVgVnaJY2GXhDHB5YoYjMtYog0TZLrV5H83Ba+W3xAPgdyL0ECAwEAAaN/MH0wHQYDVR0OBBYEFDe2MefKrwUbk++BPltiNLICNiQEME4GA1UdIwRHMEWAFDe2MefKrwUbk++BPltiNLICNiQEoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkA/tXqkR6CbTkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAN5tjBhXGUrrzN+xsqpxigHN1NyeOciMDlKbfsncbBhRgHU24vNZhUyzHNqiZx1LVPif6WoCr8wbAHPaF4YU9bE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-49.ladok.umu.se:8448/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://nya-49.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8448/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://nya-49.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAP7V6pEegm05MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU4WhcNMjIwMjE3MTIxMzU4WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPYuZlahlEeh1/3xCQuWkNeinm/ZZFsHSBBeb5rVgVnaJY2GXhDHB5YoYjMtYog0TZLrV5H83Ba+W3xAPgdyL0ECAwEAAaN/MH0wHQYDVR0OBBYEFDe2MefKrwUbk++BPltiNLICNiQEME4GA1UdIwRHMEWAFDe2MefKrwUbk++BPltiNLICNiQEoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkA/tXqkR6CbTkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAN5tjBhXGUrrzN+xsqpxigHN1NyeOciMDlKbfsncbBhRgHU24vNZhUyzHNqiZx1LVPif6WoCr8wbAHPaF4YU9bE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-49.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-49_idp-metadata.xml b/swamid-1.0/nya-49_idp-metadata.xml
index cf8e6db8..d86fc0f2 100644
--- a/swamid-1.0/nya-49_idp-metadata.xml
+++ b/swamid-1.0/nya-49_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-49.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-49.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALaxoNE9Po+PMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHoWH+BEiw7JWj7Xu/3wdHMaQucysuwS92gUjzy83Qt3kV8vHpc1BlhE8w3K0yB73eq+rwWAphD48gDyJqXf2ECAwEAAaN/MH0wHQYDVR0OBBYEFCpWaZj/0nmcPfpThsiyqvW1D7mLME4GA1UdIwRHMEWAFCpWaZj/0nmcPfpThsiyqvW1D7mLoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAtrGg0T0+j48wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHDcvXeUrdOTWOw2a1Q/0Gea3eVU1RyBcgDwd+NBD9JCnMBd+fG7XNZk7Oun5mC3D4pSazffaJYSHVvQm1kyv/4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-49.ladok.umu.se:8452/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://nya-49.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8452/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://nya-49.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALaxoNE9Po+PMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHoWH+BEiw7JWj7Xu/3wdHMaQucysuwS92gUjzy83Qt3kV8vHpc1BlhE8w3K0yB73eq+rwWAphD48gDyJqXf2ECAwEAAaN/MH0wHQYDVR0OBBYEFCpWaZj/0nmcPfpThsiyqvW1D7mLME4GA1UdIwRHMEWAFCpWaZj/0nmcPfpThsiyqvW1D7mLoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAtrGg0T0+j48wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHDcvXeUrdOTWOw2a1Q/0Gea3eVU1RyBcgDwd+NBD9JCnMBd+fG7XNZk7Oun5mC3D4pSazffaJYSHVvQm1kyv/4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-49.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml
index 7d587ec3..440a3bae 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-50.ladok.umu.se/aws-sp-en">
-
<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://nya-50.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ PVB1CNb1sjfUbkvX5zSoIKsrl3E1T1k70ec+aK0GKun8Q8kLQ4T/ApeVWA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml
index 71f90f24..89c83e2c 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-50.ladok.umu.se/aws-sp">
-
<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://nya-50.ladok.umu.se:444/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ AfvBMf8ezEVhZNiBN6F+cZ1IhAGGQSXWyXhyUY3xYjOL/tLKJMRwTw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml
index 94106a81..0df7d36a 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-50.ladok.umu.se/dw-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-50.ladok.umu.se/dw-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM2JMlR9GhRHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA2WhcNMjIwMjE3MTIxNDA2WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANw22srwDj45JduexD6YHHi/OJFr0M6X6Jcj5UNmtY0mydAfYwLfhL+pZgwve19JweratduM2V8Y5NcikbW6UjUCAwEAAaN/MH0wHQYDVR0OBBYEFGWH/ypdkLCi9kVXotsJTIQTiIcAME4GA1UdIwRHMEWAFGWH/ypdkLCi9kVXotsJTIQTiIcAoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAzYkyVH0aFEcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADkUNIGHwUSXCMOYdHFhgdzZFzf70e6rkiREVzlOYRoo0ZgR9oWW3FuFl0PM+SqbdwsUMcQF9KlXIqnOhlhP3zM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-50.ladok.umu.se:8450/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://nya-50.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8450/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://nya-50.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAM2JMlR9GhRHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA2WhcNMjIwMjE3MTIxNDA2WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANw22srwDj45JduexD6YHHi/OJFr0M6X6Jcj5UNmtY0mydAfYwLfhL+pZgwve19JweratduM2V8Y5NcikbW6UjUCAwEAAaN/MH0wHQYDVR0OBBYEFGWH/ypdkLCi9kVXotsJTIQTiIcAME4GA1UdIwRHMEWAFGWH/ypdkLCi9kVXotsJTIQTiIcAoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAzYkyVH0aFEcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADkUNIGHwUSXCMOYdHFhgdzZFzf70e6rkiREVzlOYRoo0ZgR9oWW3FuFl0PM+SqbdwsUMcQF9KlXIqnOhlhP3zM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-50.ladok.umu.se:8450/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml
index 3c72f117..9ef842fc 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-50.ladok.umu.se/ecs-sp">
-
<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://nya-50.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ Mtb7xKVUgESXBWbefVO7KqFsgXC3H0WthuTgTtskerkx0f+gylcp0g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml
index 9015c43f..c9a16ebb 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-50.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-50.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPGApjABx8azMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA3WhcNMjIwMjE3MTIxNDA3WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGg0aSovDlwHsWbyqTZsuSwca2z8Fr9+/kwAK72ost926fOzqgQKZheJe4CBkTnpIHEOwDyaW6Gml2zSQAF548CAwEAAaN/MH0wHQYDVR0OBBYEFFkuTR4a+m+xC7LmSqgfvXkyuorqME4GA1UdIwRHMEWAFFkuTR4a+m+xC7LmSqgfvXkyuorqoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkA8YCmMAHHxrMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHWOjSzJ3uedkd11ZX045Cc0Nq0mQjeDGR/ytNlYgJjUrCmJRhWJh2ZM12trRwQRdET3eyJqEsVRPyET0FKzoXg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-50.ladok.umu.se:8448/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://nya-50.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8448/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://nya-50.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJAPGApjABx8azMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA3WhcNMjIwMjE3MTIxNDA3WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGg0aSovDlwHsWbyqTZsuSwca2z8Fr9+/kwAK72ost926fOzqgQKZheJe4CBkTnpIHEOwDyaW6Gml2zSQAF548CAwEAAaN/MH0wHQYDVR0OBBYEFFkuTR4a+m+xC7LmSqgfvXkyuorqME4GA1UdIwRHMEWAFFkuTR4a+m+xC7LmSqgfvXkyuorqoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkA8YCmMAHHxrMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHWOjSzJ3uedkd11ZX045Cc0Nq0mQjeDGR/ytNlYgJjUrCmJRhWJh2ZM12trRwQRdET3eyJqEsVRPyET0FKzoXg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-50.ladok.umu.se:8448/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-50_idp-metadata.xml b/swamid-1.0/nya-50_idp-metadata.xml
index 184fce15..7b59dbf1 100644
--- a/swamid-1.0/nya-50_idp-metadata.xml
+++ b/swamid-1.0/nya-50_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nya-50.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-50.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALZGAenn5jIIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALzphMV8K+YlBHcRY+zYv8/fS/w+o3Zr0DHW5z2mFOeJvbpdZ40D+t7xV4EWEQs968y/Hk9qO+Ux/+4vAotJinUCAwEAAaN/MH0wHQYDVR0OBBYEFOBX6Tl+K0VwRvDkf2VKTgbPtTYZME4GA1UdIwRHMEWAFOBX6Tl+K0VwRvDkf2VKTgbPtTYZoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAtkYB6efmMggwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHBQz3YyWSUElipAFPU4vAMdd1pwuY+PEWpCzkmeICEF8OOxh3QNy5RW23U9kxtNWC87NGA3cowghgTnPNYcv4A=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-50.ladok.umu.se:8452/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://nya-50.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8452/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://nya-50.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALZGAenn5jIIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALzphMV8K+YlBHcRY+zYv8/fS/w+o3Zr0DHW5z2mFOeJvbpdZ40D+t7xV4EWEQs968y/Hk9qO+Ux/+4vAotJinUCAwEAAaN/MH0wHQYDVR0OBBYEFOBX6Tl+K0VwRvDkf2VKTgbPtTYZME4GA1UdIwRHMEWAFOBX6Tl+K0VwRvDkf2VKTgbPtTYZoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAtkYB6efmMggwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHBQz3YyWSUElipAFPU4vAMdd1pwuY+PEWpCzkmeICEF8OOxh3QNy5RW23U9kxtNWC87NGA3cowghgTnPNYcv4A=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-50.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/nyainloggning.slu.se.xml b/swamid-1.0/nyainloggning.slu.se.xml
index 1cf5ad8d..b31b849e 100644
--- a/swamid-1.0/nyainloggning.slu.se.xml
+++ b/swamid-1.0/nyainloggning.slu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nyainloggning.slu.se/shibboleth-sp">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyainloggning.slu.se/Shibboleth.sso/DS" index="1"/>
@@ -73,5 +72,4 @@ z20UtLAP2AqEvO2tJbiVIw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/nyautb_idp-metadata.xml b/swamid-1.0/nyautb_idp-metadata.xml
index 52b3ea41..5bc645a9 100644
--- a/swamid-1.0/nyautb_idp-metadata.xml
+++ b/swamid-1.0/nyautb_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://nyautb.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nyautb.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALa8GwfmKk4gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YXV0Yi5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMB26bGcH+dXiO5fs9gakdNWgcR7bbiat1F4GRH2XCe22vDfs+NcZzR03Dmr2dAHvRNCBwUjY+/BYUOfdJX77xkCAwEAAaN/MH0wHQYDVR0OBBYEFNtKBTHYRJIsP5SYC6gq0/qGzPiAME4GA1UdIwRHMEWAFNtKBTHYRJIsP5SYC6gq0/qGzPiAoSKkIDAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlggkAtrwbB+YqTiAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACHjHSOJaBcnVs5j845c04mYqVyZ972kRfOfNuLdTzZJ9NwEXEF+jHcIKvU7nYpFUItvyrLqA1GXN2AFb5wYZdg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nyautb.ladok.umu.se:8452/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://nyautb.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyautb.ladok.umu.se:8452/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://nyautb.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBtDCCAV6gAwIBAgIJALa8GwfmKk4gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YXV0Yi5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMB26bGcH+dXiO5fs9gakdNWgcR7bbiat1F4GRH2XCe22vDfs+NcZzR03Dmr2dAHvRNCBwUjY+/BYUOfdJX77xkCAwEAAaN/MH0wHQYDVR0OBBYEFNtKBTHYRJIsP5SYC6gq0/qGzPiAME4GA1UdIwRHMEWAFNtKBTHYRJIsP5SYC6gq0/qGzPiAoSKkIDAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlggkAtrwbB+YqTiAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACHjHSOJaBcnVs5j845c04mYqVyZ972kRfOfNuLdTzZJ9NwEXEF+jHcIKvU7nYpFUItvyrLqA1GXN2AFb5wYZdg=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nyautb.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyautb.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/openidp.feide.no.xml b/swamid-1.0/openidp.feide.no.xml
index faaca546..2762f30f 100644
--- a/swamid-1.0/openidp.feide.no.xml
+++ b/swamid-1.0/openidp.feide.no.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openidp.feide.no">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate>
</ds:X509Data>
@@ -21,7 +21,7 @@
</md:IDPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Andreas</md:GivenName>
- <md:SurName>&#xC5;kre Solberg</md:SurName>
+ <md:SurName>Åkre Solberg</md:SurName>
<md:EmailAddress>andreas@uninett.no</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-1.0/order.kib.ki.se.xml b/swamid-1.0/order.kib.ki.se.xml
index 8c9ae0e6..9ad9a2d1 100644
--- a/swamid-1.0/order.kib.ki.se.xml
+++ b/swamid-1.0/order.kib.ki.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://order.kib.ki.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://order.kib.ki.se/Shibboleth.sso/DS" index="1"/>
@@ -71,5 +70,4 @@ ZnpMbRDL4QVlO6/nMZjUzttWoq+9rjmPowjbgd3RtQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/pingpong.chalmers.se.xml b/swamid-1.0/pingpong.chalmers.se.xml
index deb0bc2d..9343f0f5 100644
--- a/swamid-1.0/pingpong.chalmers.se.xml
+++ b/swamid-1.0/pingpong.chalmers.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://pingpong.chalmers.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor>
@@ -33,4 +34,3 @@ eN939szhtbDgjf2BL5D0KmkrRPVsCVbqAcvWZ6j5u7tznMUK7l3IuWaTaRIdumnC
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/ECP" index="3"/>
</md:SPSSODescriptor>
</md:EntityDescriptor>
-
diff --git a/swamid-1.0/play.hb.se.xml b/swamid-1.0/play.hb.se.xml
index 0344d884..d12455d2 100644
--- a/swamid-1.0/play.hb.se.xml
+++ b/swamid-1.0/play.hb.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.hb.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.hb.se/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -47,5 +46,4 @@ X6RkltZT6yho98P4hxRs87RcrU+ScrgsjYZq9RoLHDPid7sDIA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/play.hig.se.xml b/swamid-1.0/play.hig.se.xml
index 87c34bf8..0cd45dd3 100644
--- a/swamid-1.0/play.hig.se.xml
+++ b/swamid-1.0/play.hig.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.hig.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.hig.se/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -47,5 +46,4 @@ xFyfdykN+11Rs4Ycb/obyh6r3/hJUeLIZQ88iuyiIDf/8DN1I5Tvduc=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/play.liu.se.xml b/swamid-1.0/play.liu.se.xml
index 815f3c83..9c3ab30d 100644
--- a/swamid-1.0/play.liu.se.xml
+++ b/swamid-1.0/play.liu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.liu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.liu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -71,5 +70,4 @@ Hk7Vkl5qHXdOgulvHmmaLJXl7ABXJmddzV49NpKlhS5V79JGu6bbkeA=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/play.lu.se.xml b/swamid-1.0/play.lu.se.xml
index 4d495e00..861eca83 100644
--- a/swamid-1.0/play.lu.se.xml
+++ b/swamid-1.0/play.lu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.lu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.lu.se/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -47,5 +46,4 @@ tG3wt4eOb5yI3XF8IM76la4ykRFQSukvkZv1Wj5YiCx5UDm+Xg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/play.mah.se.xml b/swamid-1.0/play.mah.se.xml
index 557e60ca..697675ea 100644
--- a/swamid-1.0/play.mah.se.xml
+++ b/swamid-1.0/play.mah.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mah.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.mah.se/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -47,5 +46,4 @@ mjNx3LBpLI4AqwE4TzvxzUkL5k5ZSpVzESJHvb9ljx3jnzEZuWZpH4A=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.mah.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.mah.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/play.mdh.se.xml b/swamid-1.0/play.mdh.se.xml
index 19681f80..b17a5904 100644
--- a/swamid-1.0/play.mdh.se.xml
+++ b/swamid-1.0/play.mdh.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mdh.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.mdh.se/Shibboleth.sso/DS/ds.sunet.se"/>
@@ -47,5 +46,4 @@ cPl/udSDVhrtgjhhK6hPgDEpcIskofAJC6+DejW8PESi0qV/pDpG9Eo=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.mdh.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.mdh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/play.sunet.se.xml b/swamid-1.0/play.sunet.se.xml
index 2e48a67f..2ab361e5 100644
--- a/swamid-1.0/play.sunet.se.xml
+++ b/swamid-1.0/play.sunet.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.sunet.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -73,5 +72,4 @@ wg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/portal.mdh.se.xml b/swamid-1.0/portal.mdh.se.xml
index f7ed2957..b79db3f5 100644
--- a/swamid-1.0/portal.mdh.se.xml
+++ b/swamid-1.0/portal.mdh.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.mdh.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.mdh.se/Shibboleth.sso/DS" index="1"/>
@@ -70,5 +70,4 @@ lkNHmBszvmK5Ed6NDhPnepjCOkXlHqg73CCx3E6+exvUCJ2700RntZIT8UFKu1K6
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.mdh.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.mdh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/portalservicesutv.miun.se.xml b/swamid-1.0/portalservicesutv.miun.se.xml
index 778fe383..d08258ce 100644
--- a/swamid-1.0/portalservicesutv.miun.se.xml
+++ b/swamid-1.0/portalservicesutv.miun.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portalservicesutv.miun.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portalservicesutv.miun.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -72,5 +72,4 @@ vWPiY7ukG3rEmXz1vlicbY542ygl7W7mMwL6JqPEXw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portalservicesutv.miun.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portalservicesutv.miun.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-edu-admin.it.su.se.xml b/swamid-1.0/pp-edu-admin.it.su.se.xml
index dada7bcc..be5686c3 100644
--- a/swamid-1.0/pp-edu-admin.it.su.se.xml
+++ b/swamid-1.0/pp-edu-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-edu-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-edu-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ huzT1nDeCLxTRww3QXa+xA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-edu-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-edu-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-komm-admin.it.su.se.xml b/swamid-1.0/pp-komm-admin.it.su.se.xml
index 9cb575e5..6b78cb29 100644
--- a/swamid-1.0/pp-komm-admin.it.su.se.xml
+++ b/swamid-1.0/pp-komm-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-komm-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ gWnsyGjBC5P8rFLfLiT5svPebw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-migr-admin.it.su.se.xml b/swamid-1.0/pp-migr-admin.it.su.se.xml
index 5e20b9d2..d1adc98f 100644
--- a/swamid-1.0/pp-migr-admin.it.su.se.xml
+++ b/swamid-1.0/pp-migr-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-migr-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ jttah1YP2ZgBKT3r0I5TX0xo/LpauRdGaH4YJmVzC48uBHtzC0sfDSVMa7pFVt7a
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-prod-admin.it.su.se.xml b/swamid-1.0/pp-prod-admin.it.su.se.xml
index 86e8f116..a6e73eb9 100644
--- a/swamid-1.0/pp-prod-admin.it.su.se.xml
+++ b/swamid-1.0/pp-prod-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-prod-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-prod-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ yogOGjGfiq+FxU4S3pDLXKObqfMiGTnVF6HgKD1a/F6yk6iypZjpO1hG7cfQP2bC
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-prod-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-prod-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-redmigr-admin.it.su.se.xml b/swamid-1.0/pp-redmigr-admin.it.su.se.xml
index 35668643..46cff006 100644
--- a/swamid-1.0/pp-redmigr-admin.it.su.se.xml
+++ b/swamid-1.0/pp-redmigr-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-redmigr-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ gJIKAMgGoZsdVnA8bUktfVlibXOxBDcIRLeEgA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-redtest-admin.it.su.se.xml b/swamid-1.0/pp-redtest-admin.it.su.se.xml
index d8ad72bd..cccf6b89 100644
--- a/swamid-1.0/pp-redtest-admin.it.su.se.xml
+++ b/swamid-1.0/pp-redtest-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-redtest-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ ZM0TPzxYIudNdoRwlCMbewpIpQDmj/DTPkAsKw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pp-test-admin.it.su.se.xml b/swamid-1.0/pp-test-admin.it.su.se.xml
index 2d4aa6fb..0a1ae3f8 100644
--- a/swamid-1.0/pp-test-admin.it.su.se.xml
+++ b/swamid-1.0/pp-test-admin.it.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-test-admin.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-test-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ HXJSWiUzSKMrriekzJ2y2Pkqng==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-test-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-test-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/public.it.secure.su.se.xml b/swamid-1.0/public.it.secure.su.se.xml
index 8badd496..f5eb39e0 100644
--- a/swamid-1.0/public.it.secure.su.se.xml
+++ b/swamid-1.0/public.it.secure.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://public.it.secure.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/publications.ki.se.xml b/swamid-1.0/publications.ki.se.xml
index 611c0edc..8ac9eb7e 100644
--- a/swamid-1.0/publications.ki.se.xml
+++ b/swamid-1.0/publications.ki.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://publications.ki.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -89,5 +88,4 @@ ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/referens-idp.skolfederation.se.xml b/swamid-1.0/referens-idp.skolfederation.se.xml
index 3736cd54..133451ce 100644
--- a/swamid-1.0/referens-idp.skolfederation.se.xml
+++ b/swamid-1.0/referens-idp.skolfederation.se.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://referens-idp.skolfederation.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDZTCCAk2gAwIBAgIUKPuSVuIjr2FbDlWqGOFy0ApB/O0wDQYJKoZIhvcNAQEF
BQAwKTEnMCUGA1UEAxMecmVmZXJlbnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMB4X
DTEyMDUwMjA5MDI1MVoXDTMyMDUwMjA5MDI1MVowKTEnMCUGA1UEAxMecmVmZXJl
@@ -31,36 +28,26 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
73JJwci3n22fBYfUAIPYzjETa0mJ0zg18NGK90yXH7d786hUvxsn0h/b8GBUyiZb
1d+aL8hqHTd2
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://referens-idp.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://referens-idp.skolfederation.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDZTCCAk2gAwIBAgIUKPuSVuIjr2FbDlWqGOFy0ApB/O0wDQYJKoZIhvcNAQEF
BQAwKTEnMCUGA1UEAxMecmVmZXJlbnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMB4X
DTEyMDUwMjA5MDI1MVoXDTMyMDUwMjA5MDI1MVowKTEnMCUGA1UEAxMecmVmZXJl
@@ -81,19 +68,15 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
73JJwci3n22fBYfUAIPYzjETa0mJ0zg18NGK90yXH7d786hUvxsn0h/b8GBUyiZb
1d+aL8hqHTd2
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se: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">ReferensIdP</OrganizationName>
<OrganizationDisplayName xml:lang="en">Skolfederation.SE Referens-IDP</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://skolfederation.se</OrganizationURL>
@@ -102,5 +85,4 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
<Company>SUNET</Company>
<EmailAddress>operations@skolfederation.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/registrera.hb.se.xml b/swamid-1.0/registrera.hb.se.xml
index 1c65af80..41bce9c3 100644
--- a/swamid-1.0/registrera.hb.se.xml
+++ b/swamid-1.0/registrera.hb.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registrera.hb.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -82,5 +81,4 @@ Ni1kp0+3QaewFNePHmM8yl2mPmQulTWmlzOZN9ue
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://registrera.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://registrera.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/roundup.it.su.se.xml b/swamid-1.0/roundup.it.su.se.xml
index f3af628a..c1393c6c 100644
--- a/swamid-1.0/roundup.it.su.se.xml
+++ b/swamid-1.0/roundup.it.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://roundup.it.su.se">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/rt-test-app1.it.su.se.xml b/swamid-1.0/rt-test-app1.it.su.se.xml
index 178ab5a6..ed73abca 100644
--- a/swamid-1.0/rt-test-app1.it.su.se.xml
+++ b/swamid-1.0/rt-test-app1.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt-test-app1.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ UNpiKN2S312lAEnoyhck4u1vFyWNvQpeW9Q0iNvykQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/rt.it.su.se.xml b/swamid-1.0/rt.it.su.se.xml
index 696c2e15..3264276f 100644
--- a/swamid-1.0/rt.it.su.se.xml
+++ b/swamid-1.0/rt.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt.it.su.se/Shibboleth.sso/WAYF" index="1"/>
diff --git a/swamid-1.0/samadhi.kib.ki.se.xml b/swamid-1.0/samadhi.kib.ki.se.xml
index c48d4a7d..be12eac0 100644
--- a/swamid-1.0/samadhi.kib.ki.se.xml
+++ b/swamid-1.0/samadhi.kib.ki.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samadhi.kib.ki.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -75,5 +74,4 @@ aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samadhi.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://samadhi.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/saml-1.sys.kth.se.xml b/swamid-1.0/saml-1.sys.kth.se.xml
index eabe4082..d9c35284 100644
--- a/swamid-1.0/saml-1.sys.kth.se.xml
+++ b/swamid-1.0/saml-1.sys.kth.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://saml-1.sys.kth.se/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
@@ -111,7 +111,7 @@ sdhdXg==
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">KTH</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Kungliga Tekniska h&#xF6;gskolan</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-1.0/samsok.libris.kb.se.xml b/swamid-1.0/samsok.libris.kb.se.xml
index e507fb1b..d5e9866c 100644
--- a/swamid-1.0/samsok.libris.kb.se.xml
+++ b/swamid-1.0/samsok.libris.kb.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samsok.libris.kb.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/shib-1-r.referens.sys.kth.se.xml b/swamid-1.0/shib-1-r.referens.sys.kth.se.xml
index 174e6642..7e5219c2 100644
--- a/swamid-1.0/shib-1-r.referens.sys.kth.se.xml
+++ b/swamid-1.0/shib-1-r.referens.sys.kth.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://shib-1-r.referens.sys.kth.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">referens.sys.kth.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shib-1-r.referens.sys.kth.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">referens.sys.kth.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDXDCCAkSgAwIBAgIVAIUBv1N6gZ7vliMcsnce6/+6X2dSMA0GCSqGSIb3DQEB
BQUAMCcxJTAjBgNVBAMTHHNoaWItMS1yLnJlZmVyZW5zLnN5cy5rdGguc2UwHhcN
MTAwNzIyMTIxNjMxWhcNMzAwNzIyMTIxNjMxWjAnMSUwIwYDVQQDExxzaGliLTEt
@@ -33,44 +27,26 @@ hz6p92iEQcdJkcQ0OPcd0bA6R/DisP1b+cO82mvqHGPNVgFhW83OaIKBYTW3gV84
QthuwttY8olJBR62w7wl3V8OOod3fi707iK1+uTBTBnmyCimq9tyhhRJL290c23c
A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shib-1-r.referens.sys.kth.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">referens.sys.kth.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-1-r.referens.sys.kth.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-1-r.referens.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">referens.sys.kth.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDXDCCAkSgAwIBAgIVAIUBv1N6gZ7vliMcsnce6/+6X2dSMA0GCSqGSIb3DQEB
BQUAMCcxJTAjBgNVBAMTHHNoaWItMS1yLnJlZmVyZW5zLnN5cy5rdGguc2UwHhcN
MTAwNzIyMTIxNjMxWhcNMzAwNzIyMTIxNjMxWjAnMSUwIwYDVQQDExxzaGliLTEt
@@ -90,21 +66,15 @@ hz6p92iEQcdJkcQ0OPcd0bA6R/DisP1b+cO82mvqHGPNVgFhW83OaIKBYTW3gV84
QthuwttY8olJBR62w7wl3V8OOod3fi707iK1+uTBTBnmyCimq9tyhhRJL290c23c
A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shib-1-r.referens.sys.kth.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-1-r.referens.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-1-r.referens.sys.kth.se: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">KTH-REFERENS</OrganizationName>
<OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan (REFERENS)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
@@ -113,6 +83,4 @@ A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
<Company>Royal Institute of Technology (KTH)</Company>
<EmailAddress>itesc@kth.se</EmailAddress>
</ContactPerson>
-
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/shib-idp-1.oru.se.xml b/swamid-1.0/shib-idp-1.oru.se.xml
index c20529bc..c0f6d24b 100644
--- a/swamid-1.0/shib-idp-1.oru.se.xml
+++ b/swamid-1.0/shib-idp-1.oru.se.xml
@@ -4,17 +4,16 @@
<Extensions>
<shibmd:Scope regexp="false">oru.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Örebro universitet.</mdui:Description>
- <mdui:Description xml:lang="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description>
- <!-- logo -->
- <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
+ <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Description xml:lang="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>oru.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
+ <mdui:DomainHint>oru.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
</mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-1.0/shib-idp-test.oru.se.xml b/swamid-1.0/shib-idp-test.oru.se.xml
index c41349ef..fbbe4fd5 100644
--- a/swamid-1.0/shib-idp-test.oru.se.xml
+++ b/swamid-1.0/shib-idp-test.oru.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://shib-idp-test.oru.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shib-idp-test.oru.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
@@ -34,44 +28,26 @@ tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
vs6Y0aXUmx4uTVjZQtbc
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
@@ -92,20 +68,14 @@ tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
vs6Y0aXUmx4uTVjZQtbc
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shib-idp-test.oru.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se: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">ORUTEST</OrganizationName>
<OrganizationDisplayName xml:lang="en">Örebro Universitet (TEST)</OrganizationDisplayName>
@@ -121,5 +91,4 @@ vs6Y0aXUmx4uTVjZQtbc
<SurName>Borjesson</SurName>
<EmailAddress>mikael.borjesson@oru.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/shib-sp-test.oru.se.xml b/swamid-1.0/shib-sp-test.oru.se.xml
index 93060508..5f320eec 100644
--- a/swamid-1.0/shib-sp-test.oru.se.xml
+++ b/swamid-1.0/shib-sp-test.oru.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-test.oru.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -77,5 +76,4 @@ FJ5AlQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/shib-sp.kau.se.xml b/swamid-1.0/shib-sp.kau.se.xml
index a3100a60..aa036934 100644
--- a/swamid-1.0/shib-sp.kau.se.xml
+++ b/swamid-1.0/shib-sp.kau.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.kau.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/shib1.oru.se.xml b/swamid-1.0/shib1.oru.se.xml
index 0499e17f..cc778e2c 100644
--- a/swamid-1.0/shib1.oru.se.xml
+++ b/swamid-1.0/shib1.oru.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.oru.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -96,5 +95,4 @@ Rqzek48aKj1lgjemCqPvuxaeTjFaQej9JLrxyQ1cWvsSYLuW4wnq4uvKdFRKr1hP
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib1.oru.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib1.oru.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/shibb1.hj.se.xml b/swamid-1.0/shibb1.hj.se.xml
index c44114bf..69ecb138 100644
--- a/swamid-1.0/shibb1.hj.se.xml
+++ b/swamid-1.0/shibb1.hj.se.xml
@@ -1,31 +1,25 @@
-<EntityDescriptor entityID="https://shibb1.hj.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hj.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
- <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:Logo xml:lang="sv" height="77" width="299">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
- <mdui:Logo xml:lang="en" height="77" width="277">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>hj.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibb1.hj.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hj.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
+ <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:Logo xml:lang="sv" height="77" width="299">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="77" width="277">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hj.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
@@ -45,44 +39,26 @@ Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibb1.hj.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibb1.hj.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hj.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hj.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
@@ -102,21 +78,14 @@ Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibb1.hj.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se: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">HJ</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan i Jönköping</OrganizationDisplayName>
@@ -126,5 +95,4 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
<Company>Högskolan i Jönköping</Company>
<EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibbo-test.ltu.se.xml b/swamid-1.0/shibbo-test.ltu.se.xml
index 24ff85cf..0957b877 100644
--- a/swamid-1.0/shibbo-test.ltu.se.xml
+++ b/swamid-1.0/shibbo-test.ltu.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://shibbo-test.ltu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibbo-test.ltu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDNDCCAhygAwIBAgIVANjoWHVCDRPE8UrTljXc6HDE42N7MA0GCSqGSIb3DQEB
BQUAMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5zZTAeFw0xMTAyMjAxMDUx
NTVaFw0zMTAyMjAxMDUxNTVaMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5z
@@ -34,44 +28,26 @@ HSR/YWlIQD8ISEJMDfBJ7s6HgEe0VvpRSnEPUk5fkk3maAGPQ/pojN4OhTCH1kyD
oiL/Ag7AxoE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibbo-test.ltu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibbo-test.ltu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibbo-test.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibbo-test.ltu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo-test.ltu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo-test.ltu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo-test.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo-test.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDNDCCAhygAwIBAgIVANjoWHVCDRPE8UrTljXc6HDE42N7MA0GCSqGSIb3DQEB
BQUAMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5zZTAeFw0xMTAyMjAxMDUx
NTVaFw0zMTAyMjAxMDUxNTVaMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5z
@@ -92,21 +68,15 @@ HSR/YWlIQD8ISEJMDfBJ7s6HgEe0VvpRSnEPUk5fkk3maAGPQ/pojN4OhTCH1kyD
oiL/Ag7AxoE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibbo-test.ltu.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo-test.ltu.se: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">LTUTEST</OrganizationName>
<OrganizationDisplayName xml:lang="en">Luleå tekniska universitet (TEST)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
@@ -115,5 +85,4 @@ oiL/Ag7AxoE=
<Company>Luleå tekniska universitet</Company>
<EmailAddress>Magnus.Jacobsson@ltu.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibbo.ltu.se.xml b/swamid-1.0/shibbo.ltu.se.xml
index 16628221..6ed98b93 100644
--- a/swamid-1.0/shibbo.ltu.se.xml
+++ b/swamid-1.0/shibbo.ltu.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://shibbo.ltu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibbo.ltu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
@@ -33,44 +27,26 @@ w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibbo.ltu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibbo.ltu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
@@ -90,21 +66,14 @@ w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibbo.ltu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se: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">LTU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Luleå tekniska universitet</OrganizationDisplayName>
@@ -114,5 +83,4 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
<Company>Luleå tekniska universitet</Company>
<EmailAddress>Magnus.Jacobsson@ltu.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.ebscohost.com.xml b/swamid-1.0/shibboleth.ebscohost.com.xml
index 5b8c8d3d..fdc325fa 100644
--- a/swamid-1.0/shibboleth.ebscohost.com.xml
+++ b/swamid-1.0/shibboleth.ebscohost.com.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
-
<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://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
@@ -195,5 +195,4 @@ plKXri1kg8lCT/7PobvinTLX9PpQjxGxtA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.net.lu.se.xml b/swamid-1.0/shibboleth.net.lu.se.xml
index 2a22bf2d..f2889a80 100644
--- a/swamid-1.0/shibboleth.net.lu.se.xml
+++ b/swamid-1.0/shibboleth.net.lu.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://shibboleth.net.lu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.net.lu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDOzCCAiOgAwIBAgIUHLaZATm8vxcp1L4T0A9woLa1naIwDQYJKoZIhvcNAQEF
BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5uZXQubHUuc2UwHhcNMDkwOTMwMTE0
ODIyWhcNMjkwOTMwMTE0ODIyWjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLm5ldC5s
@@ -34,44 +28,26 @@ zlPsVj43MhXLVfk/EtgL8BmxjOW08uY3EDXl3hFwJB/XRURouZC3euoBgE41FMKb
ADE1bHKRi4qX9DYfBN7g
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.net.lu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.net.lu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.net.lu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDOzCCAiOgAwIBAgIUHLaZATm8vxcp1L4T0A9woLa1naIwDQYJKoZIhvcNAQEF
BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5uZXQubHUuc2UwHhcNMDkwOTMwMTE0
ODIyWhcNMjkwOTMwMTE0ODIyWjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLm5ldC5s
@@ -92,22 +68,14 @@ zlPsVj43MhXLVfk/EtgL8BmxjOW08uY3EDXl3hFwJB/XRURouZC3euoBgE41FMKb
ADE1bHKRi4qX9DYfBN7g
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.net.lu.se: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>
-
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.net.lu.se: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">LU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Lunds universitet</OrganizationDisplayName>
diff --git a/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
index f93baab2..c71a209a 100644
--- a/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://shibboleth.nyautb.its.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.nyautb.its.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.nyautb.its.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.slu.se.xml b/swamid-1.0/shibboleth.slu.se.xml
index 5ea5d5b4..b9aea074 100644
--- a/swamid-1.0/shibboleth.slu.se.xml
+++ b/swamid-1.0/shibboleth.slu.se.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.slu.se/idp/shibboleth">
- <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
@@ -46,7 +45,7 @@ xpmbgA==</ds:X509Certificate>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.slu.se/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">slu.se</shibmd:Scope>
</Extensions>
@@ -95,5 +94,4 @@ xpmbgA==</ds:X509Certificate>
<SurName>Edholm</SurName>
<EmailAddress>stefan.edholm@slu.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.sys.kth.se.xml b/swamid-1.0/shibboleth.sys.kth.se.xml
index 16fa1c95..e200e851 100644
--- a/swamid-1.0/shibboleth.sys.kth.se.xml
+++ b/swamid-1.0/shibboleth.sys.kth.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.sys.kth.se/identity">
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
diff --git a/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
index 8f353727..b5d9dca1 100644
--- a/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://shibboleth.testa.antagning.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testa.antagning.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAMIR1Ljs4a0PMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTExMTEwMzE0NTcxNFoXDTIxMTAzMTE0NTcxNFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxBH6u5C9rgTOIq9QVn8F0Kq5sKCZk6izfhINt8Im6gwikmm2DhGCWIXOnclgcoefMgHKJ2Fawij9NQugvujNvQIDAQABo4GKMIGHMB0GA1UdDgQWBBSyFqBSSvr1ZG0mNrLnlN22o5gsETBYBgNVHSMEUTBPgBSyFqBSSvr1ZG0mNrLnlN22o5gsEaEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDCEdS47OGtDzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAMx8EuFqMVguVbA2tlwlwCAqijAcgpQ4cqdLvg1U3QmjASn/3WR/4pzvfSWWBMx1Z+ITZyBM2B+oP/wwI1DlKLA==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.testa.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testa.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAMIR1Ljs4a0PMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTExMTEwMzE0NTcxNFoXDTIxMTAzMTE0NTcxNFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxBH6u5C9rgTOIq9QVn8F0Kq5sKCZk6izfhINt8Im6gwikmm2DhGCWIXOnclgcoefMgHKJ2Fawij9NQugvujNvQIDAQABo4GKMIGHMB0GA1UdDgQWBBSyFqBSSvr1ZG0mNrLnlN22o5gsETBYBgNVHSMEUTBPgBSyFqBSSvr1ZG0mNrLnlN22o5gsEaEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDCEdS47OGtDzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAMx8EuFqMVguVbA2tlwlwCAqijAcgpQ4cqdLvg1U3QmjASn/3WR/4pzvfSWWBMx1Z+ITZyBM2B+oP/wwI1DlKLA==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testa.antagning.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testa.antagning.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
index 35cc7cc1..5b257d92 100644
--- a/swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://shibboleth.testb.antagning.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testb.antagning.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAKDyv/rU4+J6MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTExMDgzMTEyMzQzMloXDTIxMDgyODEyMzQzMlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuqMDiczO1Gj3DfxLSCMhryHFqPNYnvqBkqJQu7R5DjxM1IZndC5lIJTgIHT2e2htm50UilyPsu5SeH81xJg22QIDAQABo4GKMIGHMB0GA1UdDgQWBBRcMizYbSEJJ91KF8VB4WnEyksWdjBYBgNVHSMEUTBPgBRcMizYbSEJJ91KF8VB4WnEyksWdqEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCg8r/61OPiejAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EACQ/hKeQVaP5+pq6LQCcV20uP8M7Y+fbCQmgPioetyQwI6+BbxMkhgTbDvPYs7/y8y/hfo8RYCsmfA4SoVEQr9w==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.testb.antagning.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testb.antagning.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAKDyv/rU4+J6MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTExMDgzMTEyMzQzMloXDTIxMDgyODEyMzQzMlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuqMDiczO1Gj3DfxLSCMhryHFqPNYnvqBkqJQu7R5DjxM1IZndC5lIJTgIHT2e2htm50UilyPsu5SeH81xJg22QIDAQABo4GKMIGHMB0GA1UdDgQWBBRcMizYbSEJJ91KF8VB4WnEyksWdjBYBgNVHSMEUTBPgBRcMizYbSEJJ91KF8VB4WnEyksWdqEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCg8r/61OPiejAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EACQ/hKeQVaP5+pq6LQCcV20uP8M7Y+fbCQmgPioetyQwI6+BbxMkhgTbDvPYs7/y8y/hfo8RYCsmfA4SoVEQr9w==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testb.antagning.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testb.antagning.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
index 49c4c397..473139e0 100644
--- a/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.se: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>
</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
index cbd4b813..9d8f551c 100644
--- a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.testd.ladok.umu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testd.ladok.umu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.vhs.se.xml b/swamid-1.0/shibboleth.vhs.se.xml
index 1c05e539..d204d5e4 100755..100644
--- a/swamid-1.0/shibboleth.vhs.se.xml
+++ b/swamid-1.0/shibboleth.vhs.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://shibboleth.vhs.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.vhs.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhDCCA2ygAwIBAgIQIH68C7SNwFgAqk5SKo9fETANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTExMDcwODAwMDAwMFoXDTE0MDcwNzIzNTk1OVowXjELMAkGA1UE
@@ -40,44 +34,26 @@ POezRx+sHkS7TRJI9XkD1kgphz3QF9u8GfCvteDbl9v2TCZaKR8q1J4wd9QD2Ki1
pywz/Z6FlltyOVqgUp57YwM82wj0LPqoGnW6Pt3x+kKCRs5j2cvQpg1z9wvu8WFI
jztUvasgi2c=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.vhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.vhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://shibboleth.vhs.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.vhs.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.vhs.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.vhs.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.vhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.vhs.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.vhs.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.vhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.vhs.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhDCCA2ygAwIBAgIQIH68C7SNwFgAqk5SKo9fETANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTExMDcwODAwMDAwMFoXDTE0MDcwNzIzNTk1OVowXjELMAkGA1UE
@@ -104,21 +80,15 @@ POezRx+sHkS7TRJI9XkD1kgphz3QF9u8GfCvteDbl9v2TCZaKR8q1J4wd9QD2Ki1
pywz/Z6FlltyOVqgUp57YwM82wj0LPqoGnW6Pt3x+kKCRs5j2cvQpg1z9wvu8WFI
jztUvasgi2c=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.vhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.vhs.se: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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.vhs.se: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">VHS</OrganizationName>
<OrganizationDisplayName xml:lang="en">Verket för Högskoleservice</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.vhs.se</OrganizationURL>
@@ -127,4 +97,4 @@ jztUvasgi2c=
<Company>VHS</Company>
<EmailAddress>bjorn.soderstedt@vhs.se</EmailAddress>
</ContactPerson>
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/signon.hh.se.xml b/swamid-1.0/signon.hh.se.xml
index cea87287..c537e83e 100644
--- a/swamid-1.0/signon.hh.se.xml
+++ b/swamid-1.0/signon.hh.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://signon.hh.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://signon.hh.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
@@ -33,44 +27,26 @@ vAXrKY9loLQYkufnJ3GlXmbn3eFOyxmA11Q9xTukB8qno9QI2KMxUH8N2cG0vYXB
CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://signon.hh.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://signon.hh.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://signon.hh.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://signon.hh.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signon.hh.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.hh.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signon.hh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signon.hh.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
@@ -90,21 +66,14 @@ vAXrKY9loLQYkufnJ3GlXmbn3eFOyxmA11Q9xTukB8qno9QI2KMxUH8N2cG0vYXB
CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://signon.hh.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se: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">HH</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</OrganizationDisplayName>
@@ -114,5 +83,4 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
<Company>Högskolan i Halmstad</Company>
<EmailAddress>Magnus.Moren@hh.se</EmailAddress>
</ContactPerson>
-
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/slcstest.uninett.no.xml b/swamid-1.0/slcstest.uninett.no.xml
index 83384698..af47477f 100644
--- a/swamid-1.0/slcstest.uninett.no.xml
+++ b/swamid-1.0/slcstest.uninett.no.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slcstest.uninett.no/simplesaml/shib13/sp/metadata.php">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor>
diff --git a/swamid-1.0/smd-dev.nordu.net.xml b/swamid-1.0/smd-dev.nordu.net.xml
index 1d8939cf..bcdff661 100644
--- a/swamid-1.0/smd-dev.nordu.net.xml
+++ b/swamid-1.0/smd-dev.nordu.net.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smd-dev.nordu.net/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -70,5 +69,4 @@ MsJGKv1TOFEiCEt9POIDkms=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smd-dev.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://smd-dev.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/smd.du.se.xml b/swamid-1.0/smd.du.se.xml
index b4f97c0b..d7680946 100644
--- a/swamid-1.0/smd.du.se.xml
+++ b/swamid-1.0/smd.du.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smd.du.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://smd.du.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -71,5 +70,4 @@ jHGRWxDa0IK/byYvW4KapiGgrIEvGTCfG0Ypr0Jb4Liv
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smd.du.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://smd.du.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/smultron.catalogix.se.xml b/swamid-1.0/smultron.catalogix.se.xml
index 78791995..8aa7b26b 100644
--- a/swamid-1.0/smultron.catalogix.se.xml
+++ b/swamid-1.0/smultron.catalogix.se.xml
@@ -1,5 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor entityID="http://smultron.catalogix.se:8090/sp.xml" xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"><ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:KeyDescriptor><ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#"><ns1:X509Data><ns1:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://smultron.catalogix.se:8090/sp.xml">
+ <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <ns0:KeyDescriptor>
+ <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+ <ns1:X509Data>
+ <ns1:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
@@ -15,4 +20,19 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns1:X509Certificate></ns1:X509Data></ns1:KeyInfo></ns0:KeyDescriptor><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://smultron.catalogix.se:8090/" index="1" /></ns0:SPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">http://smultron.catalogix.se:8090/gembus.html</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>Roland</ns0:GivenName><ns0:SurName>Hedberg</ns0:SurName></ns0:ContactPerson></ns0:EntityDescriptor>
+</ns1:X509Certificate>
+ </ns1:X509Data>
+ </ns1:KeyInfo>
+ </ns0:KeyDescriptor>
+ <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://smultron.catalogix.se:8090/" index="1"/>
+ </ns0:SPSSODescriptor>
+ <ns0:Organization>
+ <ns0:OrganizationName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationName>
+ <ns0:OrganizationDisplayName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationDisplayName>
+ <ns0:OrganizationURL xml:lang="en">http://smultron.catalogix.se:8090/gembus.html</ns0:OrganizationURL>
+ </ns0:Organization>
+ <ns0:ContactPerson contactType="technical">
+ <ns0:GivenName>Roland</ns0:GivenName>
+ <ns0:SurName>Hedberg</ns0:SurName>
+ </ns0:ContactPerson>
+</ns0:EntityDescriptor>
diff --git a/swamid-1.0/sp-nya.bth.se.xml b/swamid-1.0/sp-nya.bth.se.xml
index ddec3f80..c255eb20 100644
--- a/swamid-1.0/sp-nya.bth.se.xml
+++ b/swamid-1.0/sp-nya.bth.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-nya.bth.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -71,5 +70,4 @@ ekmka1/wMV9rv31RCKyKaYvWrGBAIO8IQWWGU4X0+y/rKn71cxoskg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-nya.bth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-nya.bth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/sp-test.it.su.se.xml b/swamid-1.0/sp-test.it.su.se.xml
index d727f5f5..1889db83 100644
--- a/swamid-1.0/sp-test.it.su.se.xml
+++ b/swamid-1.0/sp-test.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -75,5 +74,4 @@ ZZ++pFd6COZSWkvz3O0kbDXKOANgr4ZylWIxYz+Fj1y8i5PN5C85ojDAIvzZ93J5
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/sp-test.swamid.se.xml b/swamid-1.0/sp-test.swamid.se.xml
index 6208d6d7..120eb1ca 100644
--- a/swamid-1.0/sp-test.swamid.se.xml
+++ b/swamid-1.0/sp-test.swamid.se.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.swamid.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -91,5 +91,4 @@ WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/sp.it.gu.se.xml b/swamid-1.0/sp.it.gu.se.xml
index d4e616de..ef0e5bc3 100644
--- a/swamid-1.0/sp.it.gu.se.xml
+++ b/swamid-1.0/sp.it.gu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.it.gu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.it.gu.se/Shibboleth.sso/DS" index="1"/>
@@ -71,5 +70,4 @@ Q9GZYzxeMEXXQg7nerDoFisoBc8c6+jlak7yEX8v5GIZSKV1XHui/yc=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.it.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.it.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/sp.kau.se.xml b/swamid-1.0/sp.kau.se.xml
index 0c5835dc..71d0e69a 100644
--- a/swamid-1.0/sp.kau.se.xml
+++ b/swamid-1.0/sp.kau.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.kau.se/shibboleth">
-
<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://sp.kau.se/Shibboleth.sso/Login"/>
@@ -42,5 +41,4 @@ myMZEHsgIBf3jkmE9uQfRGeQLiSxfg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kau.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kau.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/sp.lhs.se.xml b/swamid-1.0/sp.lhs.se.xml
index 7e5f423c..e5fd511c 100644
--- a/swamid-1.0/sp.lhs.se.xml
+++ b/swamid-1.0/sp.lhs.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lhs.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/sp.swamid.se.xml b/swamid-1.0/sp.swamid.se.xml
index 46653c6e..f21bf577 100644
--- a/swamid-1.0/sp.swamid.se.xml
+++ b/swamid-1.0/sp.swamid.se.xml
@@ -1,14 +1,11 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.swamid.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
</samla:Attribute>
@@ -92,14 +89,13 @@ IznEEJKY8IltpfdkKGE20g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
- <md:ServiceDescription xml:lang="en">SWAMID Test SP</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SWAMID Test SP</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/sp.wavelan.su.se.xml b/swamid-1.0/sp.wavelan.su.se.xml
index de7af27c..f067f0d1 100644
--- a/swamid-1.0/sp.wavelan.su.se.xml
+++ b/swamid-1.0/sp.wavelan.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.wavelan.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/staging.dreamspark.com.xml b/swamid-1.0/staging.dreamspark.com.xml
index 7a9c3577..cec32c1a 100644
--- a/swamid-1.0/staging.dreamspark.com.xml
+++ b/swamid-1.0/staging.dreamspark.com.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.dreamspark.com/shibboleth-sp">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor>
@@ -38,7 +38,8 @@ eEW5lxwrxpzVESmLHCr+HpdOsZqG6B4Nrt6UjjI9jB1rguPXKBjfUw7YAeCwx7jT
</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://staging.dreamspark.com/Shibboleth.sso/SAML/POST" index="1"></AssertionConsumerService> </SPSSODescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.dreamspark.com/Shibboleth.sso/SAML/POST" index="1"/>
+ </SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Microsoft</OrganizationName>
<OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
@@ -49,7 +50,7 @@ eEW5lxwrxpzVESmLHCr+HpdOsZqG6B4Nrt6UjjI9jB1rguPXKBjfUw7YAeCwx7jT
<EmailAddress>dsengt@microsoft.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
- <GivenName>Scott Blackwell</GivenName>
- <EmailAddress>Scott.Blackwell@microsoft.com</EmailAddress>
+ <GivenName>Scott Blackwell</GivenName>
+ <EmailAddress>Scott.Blackwell@microsoft.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/su.avedas.com.xml b/swamid-1.0/su.avedas.com.xml
index ecc3eb5d..6b5f752a 100644
--- a/swamid-1.0/su.avedas.com.xml
+++ b/swamid-1.0/su.avedas.com.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://su.avedas.com/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -65,5 +64,4 @@ lqJxZNCc13cfFv4IUL0cVlc/2mM5YnAMP1B5dDm0S2psJ+1ofWntqUTF19+jHz7S
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su.avedas.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su.avedas.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/sutest.dsv.su.se.xml b/swamid-1.0/sutest.dsv.su.se.xml
index 5693a09a..7f9ef5cc 100644
--- a/swamid-1.0/sutest.dsv.su.se.xml
+++ b/swamid-1.0/sutest.dsv.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sutest.dsv.su.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sutest.dsv.su.se/Shibboleth.sso/DS/DSV" index="1"/>
@@ -73,5 +72,4 @@ Ipamop1r0dxsmADb5Z3TF29YvB5OuZFPPwLKKg1tX9Nw+9199lffGUhEPg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/swamid.shh.se.xml b/swamid-1.0/swamid.shh.se.xml
index a2d6375e..f58261c1 100644
--- a/swamid-1.0/swamid.shh.se.xml
+++ b/swamid-1.0/swamid.shh.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://swamid.shh.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">sophia.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://swamid.shh.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">sophia.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDBDCCAeygAwIBAgIVAP7XXkV+TswNTiJKpzVkJIej7tfuMA0GCSqGSIb3DQEB
BQUAMBExDzANBgNVBAMTBnNvcGhpYTAeFw0xMDA4MzExODM5NDFaFw0zMDA4MzEx
@@ -34,44 +28,26 @@ GOv94FinTmMj7OUnqdHESZ1zpL6NB5KXFAtRXatuzFYE+g8gO1AQg83/kjlbNeM7
1HVQr72uSGQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://swamid.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://swamid.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://swamid.shh.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://swamid.shh.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://swamid.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://swamid.shh.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">sophia.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.shh.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.shh.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.shh.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">sophia.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDBDCCAeygAwIBAgIVAP7XXkV+TswNTiJKpzVkJIej7tfuMA0GCSqGSIb3DQEB
BQUAMBExDzANBgNVBAMTBnNvcGhpYTAeFw0xMDA4MzExODM5NDFaFw0zMDA4MzEx
@@ -92,19 +68,13 @@ GOv94FinTmMj7OUnqdHESZ1zpL6NB5KXFAtRXatuzFYE+g8gO1AQg83/kjlbNeM7
1HVQr72uSGQ=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://swamid.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://swamid.shh.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.shh.se: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">SOPHIA</OrganizationName>
@@ -115,4 +85,4 @@ GOv94FinTmMj7OUnqdHESZ1zpL6NB5KXFAtRXatuzFYE+g8gO1AQg83/kjlbNeM7
<Company>Sophiahemmets Högskola</Company>
<EmailAddress>ragnar.sethson@sophiahemmet.se</EmailAddress>
</ContactPerson>
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-1.0/swamid.user.uu.se.xml b/swamid-1.0/swamid.user.uu.se.xml
index 985eea70..819cc499 100644
--- a/swamid-1.0/swamid.user.uu.se.xml
+++ b/swamid-1.0/swamid.user.uu.se.xml
@@ -1,41 +1,35 @@
-<EntityDescriptor entityID="https://swamid.user.uu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
- <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
- <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>uu.se</mdui:DomainHint>
- <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
- <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
- <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
- <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
- <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
- <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
- <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
- <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
- <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
- <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://swamid.user.uu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
+ <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>uu.se</mdui:DomainHint>
+ <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+ <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+ <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+ <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+ <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+ <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
@@ -56,44 +50,26 @@ L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
2DlT+A==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
@@ -114,28 +90,22 @@ L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
2DlT+A==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://swamid.user.uu.se: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">UU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Uppsala universitet</Company>
- <SurName>AKKA SAML2</SurName>
- <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se: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">UU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <SurName>AKKA SAML2</SurName>
+ <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/tcs-escience-portal.terena.org.xml b/swamid-1.0/tcs-escience-portal.terena.org.xml
index d0641682..a6bb3f49 100644
--- a/swamid-1.0/tcs-escience-portal.terena.org.xml
+++ b/swamid-1.0/tcs-escience-portal.terena.org.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-1.0/tcs-escience.sunet.se.xml b/swamid-1.0/tcs-escience.sunet.se.xml
index d4802516..33daf4da 100644
--- a/swamid-1.0/tcs-escience.sunet.se.xml
+++ b/swamid-1.0/tcs-escience.sunet.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience.sunet.se/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
@@ -25,4 +26,4 @@
<md:SurName>LIS Unix</md:SurName>
<md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
</md:ContactPerson>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/tcs-personal-portal.terena.org.xml b/swamid-1.0/tcs-personal-portal.terena.org.xml
index c80bc1c7..9fed683f 100644
--- a/swamid-1.0/tcs-personal-portal.terena.org.xml
+++ b/swamid-1.0/tcs-personal-portal.terena.org.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-1.0/tcs-personal.sunet.se.xml b/swamid-1.0/tcs-personal.sunet.se.xml
index f5c2d211..ce2e65e6 100644
--- a/swamid-1.0/tcs-personal.sunet.se.xml
+++ b/swamid-1.0/tcs-personal.sunet.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal.sunet.se/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
@@ -25,4 +26,4 @@
<md:SurName>LIS Unix</md:SurName>
<md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
</md:ContactPerson>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/tcs-test.sunet.se.xml b/swamid-1.0/tcs-test.sunet.se.xml
index 556ce527..00b31eee 100644
--- a/swamid-1.0/tcs-test.sunet.se.xml
+++ b/swamid-1.0/tcs-test.sunet.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-test.sunet.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -67,5 +66,4 @@ VExt5K7bqNQpM9wqLuSjrlCueO4wNjuSTevHKZO6uB4DcnFnNMxWsvB81dLUdg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tcs-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/test-chalmers.pingpong.net.xml b/swamid-1.0/test-chalmers.pingpong.net.xml
index 33af72ae..62ff68b1 100644
--- a/swamid-1.0/test-chalmers.pingpong.net.xml
+++ b/swamid-1.0/test-chalmers.pingpong.net.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-chalmers.pingpong.net/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-chalmers.pingpong.net/Shibboleth.sso/Login"/>
</md:Extensions>
diff --git a/swamid-1.0/test-ki.pingpong.net.xml b/swamid-1.0/test-ki.pingpong.net.xml
index 30d57428..90145007 100644
--- a/swamid-1.0/test-ki.pingpong.net.xml
+++ b/swamid-1.0/test-ki.pingpong.net.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-ki.pingpong.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-ki.pingpong.net/Shibboleth.sso/Login"/>
@@ -40,5 +40,4 @@ kRz90uqHpg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/ECP" index="3"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/testakt.it.ki.se.xml b/swamid-1.0/testakt.it.ki.se.xml
index 90585e4f..86718c94 100644
--- a/swamid-1.0/testakt.it.ki.se.xml
+++ b/swamid-1.0/testakt.it.ki.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testakt.it.ki.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -13,7 +13,6 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://testakt.it.ki.se/Shibboleth.sso/Login"/>
@@ -62,5 +61,4 @@ MUoo/uwKQn4shjggip2k4jZ7JH/EBCXLYrptWqr7YPmos4JHpYwZwAwhFg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/testgag.it.ki.se.xml b/swamid-1.0/testgag.it.ki.se.xml
index 6e7f596d..fdba6a7f 100644
--- a/swamid-1.0/testgag.it.ki.se.xml
+++ b/swamid-1.0/testgag.it.ki.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testgag.it.ki.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -13,7 +13,6 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://testgag.it.ki.se/Shibboleth.sso/Login"/>
@@ -62,5 +61,4 @@ JDXzgzqNBDH+pyHcbSmlcA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/testshib.user.uu.se.xml b/swamid-1.0/testshib.user.uu.se.xml
index e53ad183..cbbc8e9a 100644
--- a/swamid-1.0/testshib.user.uu.se.xml
+++ b/swamid-1.0/testshib.user.uu.se.xml
@@ -1,19 +1,13 @@
-<EntityDescriptor entityID="https://testshib.user.uu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://testshib.user.uu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
@@ -34,44 +28,26 @@ entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
c/xUut3UPRusaRjG
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://testshib.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://testshib.user.uu.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://testshib.user.uu.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://testshib.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://testshib.user.uu.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testshib.user.uu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
@@ -92,19 +68,12 @@ entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
c/xUut3UPRusaRjG
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://testshib.user.uu.se: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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.se: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>
+</EntityDescriptor>
diff --git a/swamid-1.0/tools.sunet.se.xml b/swamid-1.0/tools.sunet.se.xml
index f628c9ab..7481a0e9 100644
--- a/swamid-1.0/tools.sunet.se.xml
+++ b/swamid-1.0/tools.sunet.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tools.sunet.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tools.sunet.se/Shibboleth.sso/DS" index="1"/>
@@ -70,5 +69,4 @@ XyNIJHaDalIvdnrWnQFVketJt+fje9CgALP1Btsk1g0AyD7tYw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tools.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/umdac-humpdac.ad.umu.se.xml b/swamid-1.0/umdac-humpdac.ad.umu.se.xml
index b8c8437b..ba75f112 100644
--- a/swamid-1.0/umdac-humpdac.ad.umu.se.xml
+++ b/swamid-1.0/umdac-humpdac.ad.umu.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-humpdac.ad.umu.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/umdac-olho0001.ad.umu.se.xml b/swamid-1.0/umdac-olho0001.ad.umu.se.xml
index b107956a..40fbb8f7 100644
--- a/swamid-1.0/umdac-olho0001.ad.umu.se.xml
+++ b/swamid-1.0/umdac-olho0001.ad.umu.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-olho0001.ad.umu.se/shibboleth">
<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>
@@ -55,5 +56,4 @@ yJ87d7WXKCfNlolR2zh8rlXP5N2pv2MV8UsBuPY=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/umdac-stdout.umdc.umu.se.xml b/swamid-1.0/umdac-stdout.umdc.umu.se.xml
index c1f6a103..498f5073 100644
--- a/swamid-1.0/umdac-stdout.umdc.umu.se.xml
+++ b/swamid-1.0/umdac-stdout.umdc.umu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-stdout.umdc.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
@@ -84,5 +83,4 @@ pxWTuR+O1MsLut2Mjqaq5Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-stdout.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/umdac-strike.ad.umu.se.xml b/swamid-1.0/umdac-strike.ad.umu.se.xml
index 1127737c..68cf435b 100644
--- a/swamid-1.0/umdac-strike.ad.umu.se.xml
+++ b/swamid-1.0/umdac-strike.ad.umu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-strike.ad.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.example.org/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -91,5 +90,4 @@ lI1794b9Dm6mV7L0EhmDNsX6gIy5lHdW5rfaW9gTZdImBpGECbBQlehm
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.example.org/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/umdac-utv1.ad.umu.se.xml b/swamid-1.0/umdac-utv1.ad.umu.se.xml
index 6ad23acc..fdbc3e08 100644
--- a/swamid-1.0/umdac-utv1.ad.umu.se.xml
+++ b/swamid-1.0/umdac-utv1.ad.umu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-utv1.ad.umu.se/shibboleth">
-
<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://umdac-utv1.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -56,5 +55,4 @@ NwnL2DNdxAIqK+BGt+Q0XVGJGEfnh/8XuYwTn2MNoJcxSQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/umdac-utv2.ad.umu.se.xml b/swamid-1.0/umdac-utv2.ad.umu.se.xml
index de35ab26..fc48ea0a 100644
--- a/swamid-1.0/umdac-utv2.ad.umu.se.xml
+++ b/swamid-1.0/umdac-utv2.ad.umu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-utv2.ad.umu.se/shibboleth">
-
<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://umdac-utv2.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -56,5 +55,4 @@ o8j07LCWpvQalz9EX/Vzzp3OYkp52mwu4bYgg//8pASD0A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/unitcf.se.xml b/swamid-1.0/unitcf.se.xml
index 7cd02085..ade8042c 100644
--- a/swamid-1.0/unitcf.se.xml
+++ b/swamid-1.0/unitcf.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unitcf.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://unitcf.se/Shibboleth.sso/DS" index="1"/>
@@ -71,5 +70,4 @@ IGfIdN4NBcMSvwweZYGgdB368AlQ5QP/h0xigpr/VCZG
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unitcf.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unitcf.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/uu.test.diva-portal.org.xml b/swamid-1.0/uu.test.diva-portal.org.xml
index 6447a59c..82d0f335 100644
--- a/swamid-1.0/uu.test.diva-portal.org.xml
+++ b/swamid-1.0/uu.test.diva-portal.org.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uu.test.diva-portal.org/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uu.test.diva-portal.org/Shibboleth.sso/DS" index="1"/>
@@ -72,5 +71,4 @@ OLrNDnMD/v+8CR8xqwOFEKC7BwAJB1HWfDwaKaRRbg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uu.test.diva-portal.org/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uu.test.diva-portal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/vfu-gemdev.it.su.se.xml b/swamid-1.0/vfu-gemdev.it.su.se.xml
index af347d8e..d231518f 100644
--- a/swamid-1.0/vfu-gemdev.it.su.se.xml
+++ b/swamid-1.0/vfu-gemdev.it.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-gemdev.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -72,5 +71,4 @@ UaFs0ulwkp2uVhPCL1SV0KFnIWeKpY9rkcacQlpaDxwK5TKUnmw3zA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/vfu-test.su.se.xml b/swamid-1.0/vfu-test.su.se.xml
index 9eb10fc3..ee07ba22 100644
--- a/swamid-1.0/vfu-test.su.se.xml
+++ b/swamid-1.0/vfu-test.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-test.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-test.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -73,5 +72,4 @@ oekPV73T8VB5Z870zPXiTtrpDjS4Rd+WlAcO0w4Q8wCVPg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/vfu.su.se.xml b/swamid-1.0/vfu.su.se.xml
index 19fd3e1c..301bbfc0 100644
--- a/swamid-1.0/vfu.su.se.xml
+++ b/swamid-1.0/vfu.su.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/WAYF"/>
@@ -54,5 +53,4 @@ ZbIlfQJbU+IsF+PBKYkQ9oGeHIBu0E6lRYjrmIFz1n176w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/vlab-chemsub.explizit.se.xml b/swamid-1.0/vlab-chemsub.explizit.se.xml
index bf90f8e0..013f4b5b 100644
--- a/swamid-1.0/vlab-chemsub.explizit.se.xml
+++ b/swamid-1.0/vlab-chemsub.explizit.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vlab-chemsub.explizit.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vlab-chemsub.explizit.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -89,5 +88,4 @@ C619vYmdUbDbxVdkkAhza7RsUHau77TY9QaTxvvnzT5ANR78jkgdjNhO9Ono8Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vlab-chemsub.explizit.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vlab-chemsub.explizit.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/vmfront.lan.kth.se.xml b/swamid-1.0/vmfront.lan.kth.se.xml
index 7a04836d..52a45a3e 100644
--- a/swamid-1.0/vmfront.lan.kth.se.xml
+++ b/swamid-1.0/vmfront.lan.kth.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmfront.lan.kth.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vmfront.lan.kth.se/Shibboleth.sso/DS" index="1"/>
@@ -73,5 +72,4 @@ nvPUXwQpAourZJSyt5BJwx3dJT1b
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/vmidgw3.miun.se.xml b/swamid-1.0/vmidgw3.miun.se.xml
index b618c28b..7ed92556 100644
--- a/swamid-1.0/vmidgw3.miun.se.xml
+++ b/swamid-1.0/vmidgw3.miun.se.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://vmidgw3.miun.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
@@ -30,36 +27,26 @@ A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
@@ -79,19 +66,14 @@ A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se: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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se: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">MIUN</OrganizationName>
<OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
@@ -101,5 +83,4 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
<Company>Mittuniversitetet</Company>
<EmailAddress>Ove.Olander@miun.se</EmailAddress>
</ContactPerson>
-
</EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml
index 1d29dabf..9217fd58 100644
--- a/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/aws-sp-en">
-
<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://wb11.ladok.umu.se:446/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ BEKjnO6kM3QEK6/n6G1i9Z0JWQrNGD/7Bw0SvwTWSrU5wbQ5jPn0opc7oj6pLdkr
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-aws-sp.xml b/swamid-1.0/wb11.ladok.umu.se-aws-sp.xml
index 664aec7f..867b32b2 100644
--- a/swamid-1.0/wb11.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ r47Cpg6APAhpPp1KRCo+dy+2rnvbmWi8LukIaSt25UI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml b/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
index ae67a65e..97d72433 100644
--- a/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/dw-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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>
</EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml
index 6e162f5d..346241b9 100644
--- a/swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,5 +71,4 @@ rc/DV3C2sj0TQkCAZuxvmmM4YpmAOJ7QMQzUUY4sOHU=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
index 1f0bfc70..d1319b4f 100644
--- a/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
@@ -1,61 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/shibboleth-idp">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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>
-
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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>
</EntityDescriptor>
diff --git a/swamid-1.0/wb11_idp-metadata.xml b/swamid-1.0/wb11_idp-metadata.xml
index 8b964cca..aa8eedf7 100644
--- a/swamid-1.0/wb11_idp-metadata.xml
+++ b/swamid-1.0/wb11_idp-metadata.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://wb11.ladok.umu.se/ecs-idp"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/ecs-idp">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAPzFyhFVA4HWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA0AAzWTbI6q6mggnI/HCOx4pLlP/Q8Q8PMHYHa8VYllFog2/dBblLq1t2zq3zdNSK7J9W01hhncRTm1NuAp/pAQIDAQABo30wezAdBgNVHQ4EFgQUuKstxp6djkvVjL2whcKNeOzKAP0wTAYDVR0jBEUwQ4AUuKstxp6djkvVjL2whcKNeOzKAP2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/MXKEVUDgdYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM981+w/6sk7OF2/huVe8s1OTgAKGwLFMXOkDxxXJV968wgWgXO1UOQeq9yjD3T9BbMm/S9fLTE12l6o29s3p4s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://wb11.ladok.umu.se:8452/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://wb11.ladok.umu.se:453/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8452/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://wb11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIBrjCCAVigAwIBAgIJAPzFyhFVA4HWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA0AAzWTbI6q6mggnI/HCOx4pLlP/Q8Q8PMHYHa8VYllFog2/dBblLq1t2zq3zdNSK7J9W01hhncRTm1NuAp/pAQIDAQABo30wezAdBgNVHQ4EFgQUuKstxp6djkvVjL2whcKNeOzKAP0wTAYDVR0jBEUwQ4AUuKstxp6djkvVjL2whcKNeOzKAP2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/MXKEVUDgdYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM981+w/6sk7OF2/huVe8s1OTgAKGwLFMXOkDxxXJV968wgWgXO1UOQeq9yjD3T9BbMm/S9fLTE12l6o29s3p4s=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://wb11.ladok.umu.se:8452/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>
-
-</EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8452/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>
+</EntityDescriptor>
diff --git a/swamid-1.0/webapp-utv.ita.mdh.se.xml b/swamid-1.0/webapp-utv.ita.mdh.se.xml
index c45076c4..1a662e40 100644
--- a/swamid-1.0/webapp-utv.ita.mdh.se.xml
+++ b/swamid-1.0/webapp-utv.ita.mdh.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webapp-utv.ita.mdh.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webapp-utv.ita.mdh.se/Shibboleth.sso/DS" index="1"/>
@@ -70,5 +70,4 @@ p4Dxx1fOE+4Z6F1w818nIPfOIFisdZ0n+f4Qt3oL1+WqEsM=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webapp-utv.ita.mdh.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webapp-utv.ita.mdh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/webwork.math.su.se.xml b/swamid-1.0/webwork.math.su.se.xml
index 8a77b5c4..97aed054 100644
--- a/swamid-1.0/webwork.math.su.se.xml
+++ b/swamid-1.0/webwork.math.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webwork.math.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/webwork2.math.su.se.xml b/swamid-1.0/webwork2.math.su.se.xml
index 6e9ab9d9..cbdb102d 100644
--- a/swamid-1.0/webwork2.math.su.se.xml
+++ b/swamid-1.0/webwork2.math.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webwork2.math.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/ws3.bmc.uu.se.xml b/swamid-1.0/ws3.bmc.uu.se.xml
index 23989afe..15d2dce4 100644
--- a/swamid-1.0/ws3.bmc.uu.se.xml
+++ b/swamid-1.0/ws3.bmc.uu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ws3.bmc.uu.se/shibboleth">
-
<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://ws3.bmc.uu.se/Shibboleth.sso/Login"/>
@@ -46,5 +45,4 @@ qQWpNmDn3kYrd5oTakoGUxe5200RC/e241+n+hwJtUsJ9A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml b/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
index 89660c6f..92b13f7c 100644
--- a/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-en.nyautb.its.umu.se/aws-sp-en">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ S72ZoHYu9zf1dW77BoUB
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
index 797bf625..0b183af7 100644
--- a/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-en.testc.ladok.umu.se/aws-sp-en">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ E2gDCP4Dxhit8z81uTyc843g/g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
index e1a1df71..506d09fd 100644
--- a/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-en.testd.ladok.umu.se/aws-sp-en">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ UB28P1ZfxwQO+Evo145MDgcHyw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.antagning.se-aws-sp.xml b/swamid-1.0/www.antagning.se-aws-sp.xml
index f3d59595..1908031f 100644
--- a/swamid-1.0/www.antagning.se-aws-sp.xml
+++ b/swamid-1.0/www.antagning.se-aws-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.se/aws-sp">
<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>
@@ -46,5 +47,4 @@ wo1Z+XF5sAEJ3w30UnCsgh0Muvwlyb3cnRvYFA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.antagning.testa.antagning.se-ecs-sp.xml b/swamid-1.0/www.antagning.testa.antagning.se-ecs-sp.xml
index 70eaab3a..ae040114 100644
--- a/swamid-1.0/www.antagning.testa.antagning.se-ecs-sp.xml
+++ b/swamid-1.0/www.antagning.testa.antagning.se-ecs-sp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testa.antagning.se/ecs-sp">
<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:KeyDescriptor use="signing">
diff --git a/swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml b/swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
index 77564581..0f0986cc 100644
--- a/swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testc.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml b/swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
index 705fcc89..f621984e 100644
--- a/swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testd.ladok.umu.se/ecs-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.bmcmediatek.uu.se.xml b/swamid-1.0/www.bmcmediatek.uu.se.xml
index dc248297..d21ca81b 100644
--- a/swamid-1.0/www.bmcmediatek.uu.se.xml
+++ b/swamid-1.0/www.bmcmediatek.uu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ws3.bmc.uu.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,5 +67,4 @@ x9hzjw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bmcmediatek.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.cambro.umu.se.xml b/swamid-1.0/www.cambro.umu.se.xml
index 9c2ba927..7f8532ac 100644
--- a/swamid-1.0/www.cambro.umu.se.xml
+++ b/swamid-1.0/www.cambro.umu.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cambro.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cambro.umu.se/Shibboleth.sso/DS" index="1"/>
@@ -82,5 +81,4 @@ icknTeF+RsafVHg+EFL9nH4U/yB6wesYu8jG5Fsv5p+ARKVdZb9YWXaRPtH3mzpN
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.diva-portal.org.xml b/swamid-1.0/www.diva-portal.org.xml
index 2e354ba8..e23d614c 100644
--- a/swamid-1.0/www.diva-portal.org.xml
+++ b/swamid-1.0/www.diva-portal.org.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.diva-portal.org/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -69,14 +68,14 @@ H5e8OA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.diva-portal.org/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.diva-portal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">DiVA</md:ServiceName>
- <md:ServiceDescription xml:lang="en">DiVA – Academic Archive Online - is a system for electronic publishing and for registering publications produced by researchers, teachers and students. Uppsala University Library develops and maintains DiVA.</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
- </md:AttributeConsumingService>
+ <md:ServiceName xml:lang="en">DiVA</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">DiVA – Academic Archive Online - is a system for electronic publishing and for registering publications produced by researchers, teachers and students. Uppsala University Library develops and maintains DiVA.</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml b/swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml
index c40affad..c431f94a 100644
--- a/swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml
+++ b/swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nyautb.its.umu.se/aws-sp">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/Login"/>
@@ -48,5 +47,4 @@ q0fSD2UYJYx8S9IpkqG7mWO35bLr82mvxauG36M+2z9nXaxpgjCDWMCBQUe5WvxK
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.play.umu.se.xml b/swamid-1.0/www.play.umu.se.xml
index 5367eb5b..ce677376 100644
--- a/swamid-1.0/www.play.umu.se.xml
+++ b/swamid-1.0/www.play.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.play.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.play.umu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
@@ -71,5 +70,4 @@ LfULDFRxeDlyaxgD0s66OCLxachVt6b18FLPbnHRJxLYzFpZyoLLPKg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.play.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.play.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.servicedesk.its.umu.se.xml b/swamid-1.0/www.servicedesk.its.umu.se.xml
index dfe4b47a..2c694e38 100644
--- a/swamid-1.0/www.servicedesk.its.umu.se.xml
+++ b/swamid-1.0/www.servicedesk.its.umu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.servicedesk.its.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -82,5 +82,4 @@ Ak0+kMSVOzv6UoGDUEbEh2o5K1iQnOzUKyTJrfW1if1I8Wg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.student.teol.uu.se.xml b/swamid-1.0/www.student.teol.uu.se.xml
index 9cbde50a..3b452497 100644
--- a/swamid-1.0/www.student.teol.uu.se.xml
+++ b/swamid-1.0/www.student.teol.uu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.student.teol.uu.se">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -37,5 +37,4 @@ gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/POST" index="10"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.studera.nu.xml b/swamid-1.0/www.studera.nu.xml
index 113aadce..4ced63eb 100644
--- a/swamid-1.0/www.studera.nu.xml
+++ b/swamid-1.0/www.studera.nu.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.nu/shibboleth-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -71,5 +70,4 @@ To0ucpLgYZwm1LIEXh4+VZuM2irCpX+guvFa
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.nu/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.nu/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.studera.testb.antagning.se.xml b/swamid-1.0/www.studera.testb.antagning.se.xml
index 136d884a..e4cc6492 100644
--- a/swamid-1.0/www.studera.testb.antagning.se.xml
+++ b/swamid-1.0/www.studera.testb.antagning.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testb.antagning.se/shibboleth-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -73,5 +72,4 @@ Jts+WMokFPGmBI606RWPMu7mpWz7aaT0zh98ifV4tjNWS0GhrtWRAcKj+Kvu
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml b/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
index fe585f61..94540810 100644
--- a/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testc.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml b/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
index 522c62ce..6d5429ef 100644
--- a/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testd.ladok.umu.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.sub.su.se.xml b/swamid-1.0/www.sub.su.se.xml
index 0e75e656..da8b32e0 100644
--- a/swamid-1.0/www.sub.su.se.xml
+++ b/swamid-1.0/www.sub.su.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sub.su.se">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/www.testa.antagning.se-aws-sp.xml b/swamid-1.0/www.testa.antagning.se-aws-sp.xml
index 4b2ab0d3..79e949cf 100644
--- a/swamid-1.0/www.testa.antagning.se-aws-sp.xml
+++ b/swamid-1.0/www.testa.antagning.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testa.antagning.se/aws-sp">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.antagning.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ Nwmwca4vUPP18NPxE6sVgzPFFieSJjeVNXufl0sye1Q=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.testa.universityadmissions.se.xml b/swamid-1.0/www.testa.universityadmissions.se.xml
index 19863621..c0418536 100644
--- a/swamid-1.0/www.testa.universityadmissions.se.xml
+++ b/swamid-1.0/www.testa.universityadmissions.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testa.universityadmissions.se/aws-sp-en">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/Login"/>
@@ -50,5 +49,4 @@ aERyA2E=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.testb.antagning.se-aws-sp.xml b/swamid-1.0/www.testb.antagning.se-aws-sp.xml
index e7a1c3d5..af20e31c 100644
--- a/swamid-1.0/www.testb.antagning.se-aws-sp.xml
+++ b/swamid-1.0/www.testb.antagning.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testb.antagning.se/aws-sp">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -74,5 +73,4 @@ UvKqjQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml
index 3c1c4f87..a6856240 100644
--- a/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testb.universityadmissions.se/aws-sp-en">
<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>
@@ -48,5 +49,4 @@ Ozn4TSg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml b/swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml
index ecd88b29..4c191189 100644
--- a/swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testc.ladok.umu.se/aws-sp">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ XwK+Eg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml b/swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml
index 0ad94d04..dcafb5d7 100644
--- a/swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testd.ladok.umu.se/aws-sp">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ AqGHpw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
index 6ba5b456..30e00a64 100644
--- a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.universityadmissions.se/aws-sp-en">
<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>
@@ -47,5 +48,4 @@ kLtKCIiImX90JFDcYwMMQyXM3dXWrJFi7exA
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.wisum.its.umu.se.xml b/swamid-1.0/www.wisum.its.umu.se.xml
index 79e00c69..46e08e4f 100644
--- a/swamid-1.0/www.wisum.its.umu.se.xml
+++ b/swamid-1.0/www.wisum.its.umu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.wisum.its.umu.se/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.wisum.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -58,5 +58,4 @@ OcDpjfKHDLFsBPpZe+UjlqC/cNWZzLC4/hd1DnVldzZGeaVZxYv2IXFsXk1Kn5YL
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www.wisum.umdac.umu.se.xml b/swamid-1.0/www.wisum.umdac.umu.se.xml
index 00100bb0..04e88dce 100644
--- a/swamid-1.0/www.wisum.umdac.umu.se.xml
+++ b/swamid-1.0/www.wisum.umdac.umu.se.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.wisum.umdac.umu.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -88,5 +87,4 @@ aeuGsLFXZYIsTtz9zAy13nUaPG+xk3JAFte9p+nYhB0+NOZY9sEKoJEK/1FW5wol
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wisum.umdac.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wisum.umdac.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www07test.sub.su.se.xml b/swamid-1.0/www07test.sub.su.se.xml
index 565c3f9f..af0491df 100644
--- a/swamid-1.0/www07test.sub.su.se.xml
+++ b/swamid-1.0/www07test.sub.su.se.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www07test.sub.su.se">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -56,5 +55,4 @@ gG19ycA9AsUe
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www2.student.teol.uu.se.xml b/swamid-1.0/www2.student.teol.uu.se.xml
index 8afdbcd6..b37209df 100644
--- a/swamid-1.0/www2.student.teol.uu.se.xml
+++ b/swamid-1.0/www2.student.teol.uu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.student.teol.uu.se">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www2.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -37,5 +37,4 @@ gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/POST" index="10"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www2.teol.uu.se.xml b/swamid-1.0/www2.teol.uu.se.xml
index b7aa1bdd..2ac77318 100644
--- a/swamid-1.0/www2.teol.uu.se.xml
+++ b/swamid-1.0/www2.teol.uu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org/shibboleth">
-
<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://www2.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -37,5 +37,4 @@ gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/www3.genuinetext.com.xml b/swamid-1.0/www3.genuinetext.com.xml
index 715d560a..ffab244e 100644
--- a/swamid-1.0/www3.genuinetext.com.xml
+++ b/swamid-1.0/www3.genuinetext.com.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.genuinetext.com/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-1.0/www4.genuinetext.com.xml b/swamid-1.0/www4.genuinetext.com.xml
index df4e8e5d..587092c4 100644
--- a/swamid-1.0/www4.genuinetext.com.xml
+++ b/swamid-1.0/www4.genuinetext.com.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www4.genuinetext.com/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www4.genuinetext.com/Shibboleth.sso/DS" index="1"/>
@@ -73,5 +72,4 @@ iMZC8zXUhA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-1.0/xfire.mimas.ac.uk.xml b/swamid-1.0/xfire.mimas.ac.uk.xml
index b4e7835c..e5e3a10c 100644
--- a/swamid-1.0/xfire.mimas.ac.uk.xml
+++ b/swamid-1.0/xfire.mimas.ac.uk.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xfire.mimas.ac.uk/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
diff --git a/swamid-2.0/akka-anv.uu.se.xml b/swamid-2.0/akka-anv.uu.se.xml
index 39cc5df0..ad77f731 100644
--- a/swamid-2.0/akka-anv.uu.se.xml
+++ b/swamid-2.0/akka-anv.uu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://akka-anv.uu.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -13,15 +13,12 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- </samla:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://akka-anv.uu.se/Shibboleth.sso/Login"/>
@@ -83,5 +80,4 @@ JnhHj8Wsg0csCS86vOCTNXVKXHcRIUL5FaLf+8MrSHrs8WR4CN4AHLuprwthtQyV
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/POST" index="11"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/Artifact" index="12"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/akkatest.its.uu.se.xml b/swamid-2.0/akkatest.its.uu.se.xml
index 0b5c3091..939a484c 100644
--- a/swamid-2.0/akkatest.its.uu.se.xml
+++ b/swamid-2.0/akkatest.its.uu.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://akkatest.its.uu.se/Shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<md:KeyDescriptor>
@@ -30,4 +31,3 @@ blxtYGVB1uGczqhd4Vn/jIHHcW5mx6oamuRXMcuRoAIJxw8aL7s+0Gm6vNNbLIpt
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akkatest.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
</md:SPSSODescriptor>
</md:EntityDescriptor>
-
diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml
index e1632e8e..0f4ec206 100644
--- a/swamid-2.0/aktivera.ki.se-shibboleth.xml
+++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aktivera.ki.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -13,13 +12,11 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
-
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet</mdui:DisplayName>
@@ -27,7 +24,6 @@
<mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description>
</mdui:UIInfo>
</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://aktivera.ki.se/Shibboleth.sso/Login"/>
@@ -76,5 +72,4 @@ t1UEJRh1QFCjTJZ0dWFqE9ZDz8jPeZGuERdOnxv9ooMtwU9t1w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-idp.sunet.se.xml b/swamid-2.0/artisan-idp.sunet.se.xml
index b053618c..444be912 100644
--- a/swamid-2.0/artisan-idp.sunet.se.xml
+++ b/swamid-2.0/artisan-idp.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://artisan-idp.sunet.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
index 74b7fe1d..36b100d3 100644
--- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
+++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bedomningshandboken.uhr.se/shibboleth">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -30,7 +29,6 @@
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/Login"/>
@@ -81,5 +79,4 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.sunet.se-idp.xml b/swamid-2.0/box-idp.sunet.se-idp.xml
index 830a60bd..87a129b7 100644
--- a/swamid-2.0/box-idp.sunet.se-idp.xml
+++ b/swamid-2.0/box-idp.sunet.se-idp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://box-idp.sunet.se/simplesaml/saml2/idp/metadata.php">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDjjCCAnagAwIBAgIJAKbtZfJN7G7eMA0GCSqGSIb3DQEBBQUAMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTAeFw0xMjA0MTkwNzAxMTBaFw0yMjA0MTkwNzAxMTBaMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+53L5J4zaSe/ot/CU+fX/xsE0q2Vsvgs6Jrz4bgPtkiXcCCRcp1kV9wRxBEohK75DtumowRN9P0qL5SsawM5o6XflMpL9vhO1Xvi8NnrFp/utUnjwevgbxsi5efetqIezE+B8cimv1MEfN4/XxiCuKbqluEC4HYuopf9Cn32ob2VnQA31WYwW42+pfS733M4EIMYkpBdaacpJKFmCsu9BHnGgFTiSgJsvX9OGG7iwSB31Jp817BFOB0yhvx7Y2yFLSnRyyg/20BJ0t9R8UFVB4rx5bjyTlTGwvPg048UV8Go3wDSax18OT0AoTfE7O3QoXNOhPr1qi4bs0KL92R7sCAwEAAaOBmjCBlzAdBgNVHQ4EFgQUluTZFj+ee4BZ0slOOiUpsZG/KjwwaAYDVR0jBGEwX4AUluTZFj+ee4BZ0slOOiUpsZG/KjyhPKQ6MDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZYIJAKbtZfJN7G7eMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADPhDcfQDwHGhTeQuSDaBfa1/gbJkuiNRZSN000CIM1BalnuK5unV05SvBMG4t7mSj9oO+NnpjEBfV393I2XV5ICRuHbUpoX8tezGOA3I8amItR6WzJtFSn/Dv230KRcEuCAWz/A7LKog16eOPPDj64vBI9Lk5gYpXRB3y1Pnv+5IUgXb2YnS6XAEduHpm2dkj2CuSmpsWTPJapm/opsJvmrkZbvwQN1POPDyWW8Rb/gSr7XpFsDQ7lXObd2ADv82WENB6DLuUq1ilAkVR8Zs4OkFnLYASFUC25GtfUdUap/anb5gHF7a8MKN+NYlfNQWE1dm1jccCnA3eIBxkArDdU=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDjjCCAnagAwIBAgIJAKbtZfJN7G7eMA0GCSqGSIb3DQEBBQUAMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTAeFw0xMjA0MTkwNzAxMTBaFw0yMjA0MTkwNzAxMTBaMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+53L5J4zaSe/ot/CU+fX/xsE0q2Vsvgs6Jrz4bgPtkiXcCCRcp1kV9wRxBEohK75DtumowRN9P0qL5SsawM5o6XflMpL9vhO1Xvi8NnrFp/utUnjwevgbxsi5efetqIezE+B8cimv1MEfN4/XxiCuKbqluEC4HYuopf9Cn32ob2VnQA31WYwW42+pfS733M4EIMYkpBdaacpJKFmCsu9BHnGgFTiSgJsvX9OGG7iwSB31Jp817BFOB0yhvx7Y2yFLSnRyyg/20BJ0t9R8UFVB4rx5bjyTlTGwvPg048UV8Go3wDSax18OT0AoTfE7O3QoXNOhPr1qi4bs0KL92R7sCAwEAAaOBmjCBlzAdBgNVHQ4EFgQUluTZFj+ee4BZ0slOOiUpsZG/KjwwaAYDVR0jBGEwX4AUluTZFj+ee4BZ0slOOiUpsZG/KjyhPKQ6MDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZYIJAKbtZfJN7G7eMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADPhDcfQDwHGhTeQuSDaBfa1/gbJkuiNRZSN000CIM1BalnuK5unV05SvBMG4t7mSj9oO+NnpjEBfV393I2XV5ICRuHbUpoX8tezGOA3I8amItR6WzJtFSn/Dv230KRcEuCAWz/A7LKog16eOPPDj64vBI9Lk5gYpXRB3y1Pnv+5IUgXb2YnS6XAEduHpm2dkj2CuSmpsWTPJapm/opsJvmrkZbvwQN1POPDyWW8Rb/gSr7XpFsDQ7lXObd2ADv82WENB6DLuUq1ilAkVR8Zs4OkFnLYASFUC25GtfUdUap/anb5gHF7a8MKN+NYlfNQWE1dm1jccCnA3eIBxkArDdU=</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-2.0/box-idp.sunet.se.xml b/swamid-2.0/box-idp.sunet.se.xml
index 3c47ca1d..835d719e 100644
--- a/swamid-2.0/box-idp.sunet.se.xml
+++ b/swamid-2.0/box-idp.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/box.net.xml b/swamid-2.0/box.net.xml
index c3dcbfe9..b079411c 100644
--- a/swamid-2.0/box.net.xml
+++ b/swamid-2.0/box.net.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="box.net">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/ci.nordu.net.xml b/swamid-2.0/ci.nordu.net.xml
index cb159018..938a34ff 100644
--- a/swamid-2.0/ci.nordu.net.xml
+++ b/swamid-2.0/ci.nordu.net.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ci.nordu.net/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ci.nordu.net/Shibboleth.sso/Login"/>
@@ -42,5 +42,4 @@ Ngx5k0w6C4avz1ua/NNuUD5WoB1mXA+YiQiIEUTnPQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ci.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ci.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/coip.app.nordu.net.xml b/swamid-2.0/coip.app.nordu.net.xml
index fb3c1a29..88331db5 100644
--- a/swamid-2.0/coip.app.nordu.net.xml
+++ b/swamid-2.0/coip.app.nordu.net.xml
@@ -1,5 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<md:EntityDescriptor entityID="https://coip.app.nordu.net/saml2/sp/metadata" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coip.app.nordu.net/saml2/sp/metadata">
+ <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
@@ -25,4 +30,33 @@ f06K4cm7ngUg80ZEYK00ioAyFle56qPfZ5UM25QFzV38DGvusLl5H1bTtpz1ijh7
kO/ehJVo4K64KVCbjOr1bavp665TtcIQX2qoPsnTZY30gQ/X/K2UJQSUE5Qc+o19
BkvvVT5jNYdeLZHXbC6X4kXYNhFKZaz9nURgfaFQIeIEu/zmsIM8tcwLjZyF1veH
wXXiBDXS3PNHXQnnpys=
-</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coip.app.nordu.net/saml2/sp/ls/" /><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip.app.nordu.net/saml2/sp/acs/" index="1" /><md:AttributeConsumingService index="1"><md:ServiceName xml:lang="en">COIP</md:ServiceName><md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /></md:AttributeConsumingService></md:SPSSODescriptor><md:Organization><md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName><md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName><md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL></md:Organization><md:ContactPerson contactType="technical"><md:Company>NORDUnet</md:Company><md:GivenName>Leif</md:GivenName><md:SurName>Johansson</md:SurName><md:EmailAddress>leifj@nordu.net</md:EmailAddress></md:ContactPerson><md:ContactPerson contactType="technical"><md:Company>NORDUnet</md:Company><md:GivenName>Johan</md:GivenName><md:SurName>Berggren</md:SurName><md:EmailAddress>jbn@nordu.net</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coip.app.nordu.net/saml2/sp/ls/"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip.app.nordu.net/saml2/sp/acs/" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">COIP</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:Company>NORDUnet</md:Company>
+ <md:GivenName>Leif</md:GivenName>
+ <md:SurName>Johansson</md:SurName>
+ <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>NORDUnet</md:Company>
+ <md:GivenName>Johan</md:GivenName>
+ <md:SurName>Berggren</md:SurName>
+ <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/connect.funet.fi.xml b/swamid-2.0/connect.funet.fi.xml
index 352f3f59..19ec84f8 100644
--- a/swamid-2.0/connect.funet.fi.xml
+++ b/swamid-2.0/connect.funet.fi.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.funet.fi/shibboleth">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -71,15 +71,14 @@ EMBSvHkNXEFDf/FDbw4kjn5ie1pmF4qu+jHVHyB4y4Roz0QFoYIeOWaRMw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.funet.fi/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.funet.fi/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">FUNET E-Meeting Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">FUNET E-Meeting Service (Adobe Connect)</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">FUNET E-Meeting Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">FUNET E-Meeting Service (Adobe Connect)</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml b/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
index 680561bf..db81f977 100644
--- a/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
+++ b/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd-test.it.su.se/Shibboleth.sso">
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -14,7 +13,7 @@
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -84,5 +83,4 @@ KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index d0e174b3..d9f56898 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -1,12 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
diff --git a/swamid-2.0/fs.liu.se.xml b/swamid-2.0/fs.liu.se.xml
index e5e34493..0b75b816 100644
--- a/swamid-2.0/fs.liu.se.xml
+++ b/swamid-2.0/fs.liu.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.liu.se/adfs/services/trust">
<RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
<KeyDescriptor use="encryption">
@@ -316,8 +316,8 @@
<Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
</IDPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="sv-SE">Link&#xF6;ping University</OrganizationName>
- <OrganizationDisplayName xml:lang="sv-SE">Link&#xF6;ping University (ADFS)</OrganizationDisplayName>
+ <OrganizationName xml:lang="sv-SE">Linköping University</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv-SE">Linköping University (ADFS)</OrganizationDisplayName>
<OrganizationURL xml:lang="sv-SE">http://www.liu.se/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-2.0/gidp.geant.net-sp.xml b/swamid-2.0/gidp.geant.net-sp.xml
index cedb87d3..72e6b642 100644
--- a/swamid-2.0/gidp.geant.net-sp.xml
+++ b/swamid-2.0/gidp.geant.net-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net/sp/module.php/saml/sp/metadata.php/default-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/hades.slu.se.xml b/swamid-2.0/hades.slu.se.xml
index 0eee46b9..f669b10f 100644
--- a/swamid-2.0/hades.slu.se.xml
+++ b/swamid-2.0/hades.slu.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hades.slu.se/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
diff --git a/swamid-2.0/idp-test.nordu.net-sp.xml b/swamid-2.0/idp-test.nordu.net-sp.xml
index d7c2de66..327f7250 100644
--- a/swamid-2.0/idp-test.nordu.net-sp.xml
+++ b/swamid-2.0/idp-test.nordu.net-sp.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/idp-test.nordu.net-ssp-idp.xml b/swamid-2.0/idp-test.nordu.net-ssp-idp.xml
index f086b725..12ae465e 100644
--- a/swamid-2.0/idp-test.nordu.net-ssp-idp.xml
+++ b/swamid-2.0/idp-test.nordu.net-ssp-idp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-test.nordu.net/simplesaml/saml2/idp/metadata.php">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-2.0/idp.kb.se.xml b/swamid-2.0/idp.kb.se.xml
index 9775cdbd..74d40456 100644
--- a/swamid-2.0/idp.kb.se.xml
+++ b/swamid-2.0/idp.kb.se.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.kb.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -30,35 +27,26 @@ eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
HoPbenzIMS3KvKqUl64+5qwAZhM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -78,25 +66,22 @@ eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
HoPbenzIMS3KvKqUl64+5qwAZhM=
</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se: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">KB</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Kungliga Biblioteket</Company>
- <EmailAddress>swamid@kb.se</EmailAddress>
- </ContactPerson>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se: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">KB</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Kungliga Biblioteket</Company>
+ <EmailAddress>swamid@kb.se</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp2-1.slu.se.xml b/swamid-2.0/idp2-1.slu.se.xml
index d5de15c2..359287e1 100644
--- a/swamid-2.0/idp2-1.slu.se.xml
+++ b/swamid-2.0/idp2-1.slu.se.xml
@@ -3,7 +3,6 @@
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
diff --git a/swamid-2.0/idp2-test.slu.se.xml b/swamid-2.0/idp2-test.slu.se.xml
index b79da4ff..d1307027 100644
--- a/swamid-2.0/idp2-test.slu.se.xml
+++ b/swamid-2.0/idp2-test.slu.se.xml
@@ -1,4 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?><EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2-test.slu.se/idp/shibboleth" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"><Extensions><shibmd:Scope regexp="false">slu.se</shibmd:Scope></Extensions><KeyDescriptor><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2-test.slu.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz
WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU
@@ -14,7 +23,27 @@ nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs
oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS
0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K
YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
-6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate></ds:X509Data></ds:KeyInfo></KeyDescriptor><ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/><ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/><NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat><NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat><SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-test.slu.se/idp/profile/Shibboleth/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-test.slu.se/idp/profile/SAML2/Redirect/SSO"/></IDPSSODescriptor><AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"><Extensions><shibmd:Scope regexp="false">slu.se</shibmd:Scope></Extensions><KeyDescriptor><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
+6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-test.slu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-test.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz
WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU
@@ -30,4 +59,30 @@ nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs
oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS
0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K
YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
-6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate></ds:X509Data></ds:KeyInfo></KeyDescriptor><AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/><AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se: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 xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">Swedish University of Agricultural Science</OrganizationName><OrganizationDisplayName xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName><OrganizationURL xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">http://www.slu.se/en/</OrganizationURL></Organization><ContactPerson contactType="technical" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Pia Skotare</GivenName><EmailAddress>mailto:pia.skotare@gmail.com</EmailAddress></ContactPerson><ContactPerson contactType="administrative" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Bo Sarling</GivenName><EmailAddress>mailto:bo.sarling@slu.se</EmailAddress></ContactPerson><ContactPerson contactType="support" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Help Desk</GivenName><EmailAddress>mailto:IT-stod@slu.se</EmailAddress></ContactPerson></EntityDescriptor> \ No newline at end of file
+6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se: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">Swedish University of Agricultural Science</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>Pia Skotare</GivenName>
+ <EmailAddress>mailto:pia.skotare@gmail.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <GivenName>Bo Sarling</GivenName>
+ <EmailAddress>mailto:bo.sarling@slu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <GivenName>Help Desk</GivenName>
+ <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
index b9422621..24c53f8f 100644
--- a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
+++ b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp2.test.umu.se/saml2/idp/metadata.php">
<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">umu.se</shibmd:Scope>
+ <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
</md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEeDCCA2CgAwIBAgIQSNslvGdmCXnbM5xzWOyrwTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDkwMTAwMDAwMFoXDTEzMDgzMTIzNTk1OVowUzELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDjAMBgNVBAsTBVVNREFDMRkwFwYDVQQDExBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqnsLBvs8DxJffl1zqULjBc1a+c1+mH+eW2BgUxNOG9FJCZqWAJFO8T4m3c1kO9VSQRSFqCMhQd08bfzySevDwgjX3+mR0UfJbtvcCLujDbSnE/1KgMv9EWcqzqyHsw8sL4ShG21pKaCjlP7Abq9T1flRixM+y47LEqnMlHOPKzNG4+366YzKIudsqNeiqwwAmEE4FZEwooBj8paWl800tNL4fUc7Y4sBxfs3j9e0h3sr32LRhQCL8wAa3OrRmoBrbEp/QDygQZ/XE+cjgbDSPzV/Ii4av4CF8OU+lYysrIZMDkTWjbXwkofm7HwbWgb+ukGO4RQdlf1gTG3pn15fQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBRq/M6MhWNHffNKe9OpmRL57m17MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGlkcDIudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALNp2cyl51WNMXfW6YKwmZ6uOu07sGb5ONvteQ8L3qw8bN5ftBiGGi4LeckZj1K2/ql6roW2AeBdH2ZbsSPzfbgZUGVvZMqm0t/Ty24bhAcBtGmJd8oxDH5z8EwMA3Ko5y/n3Mxgn4kjwmDAuF44aVQG8s7Hh9eVvkQyD81ABpUACj+iqs1ynACdQAk2/As4zsCE0iaew/NQ52R7awPB5KitXABpiaj5pDTEsMVRuSKnTErLNTNE9gE0eeuN8bGsU3Hj7ndohqt8bSQLapIHU8odY52Ekjaq8L4etnipjTxrvZqu5TSskrkb9uOViUWND9DB1fKmTUaAeKWlOS/B0X0=</ds:X509Certificate>
</ds:X509Data>
@@ -33,8 +33,8 @@
<md:Organization>
<md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
<md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (New)</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (Ny)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Umeå University (New)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="se">Umeå universitet (Ny)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
<md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index 4e19aeee..5041d272 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-00.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ w5aKug==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index c137fe17..868ec842 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-01.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ p012eg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
index 3e12acba..f784e817 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-02.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ BeVqTg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
index fa49441a..d9220aef 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-03.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ OqxKbw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
index a77e5750..fb1dfeab 100644
--- a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-04.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ AMLCoA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
index 69d672cb..3136654d 100644
--- a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-05.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ Ij/QYw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
index aa950fb0..e3a15881 100644
--- a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-06.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ z181Cw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
index a4f85a52..8831ec02 100644
--- a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-07.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ LB5BtA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
index 286687a5..664b3fbc 100644
--- a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-08.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ MTpiVw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
index cd329168..72d62392 100644
--- a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-09.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ QwOzJA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
index 3351bdba..07a39ec4 100644
--- a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-10.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ zL2y+w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
index d81023f8..dbf5a750 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-00.its.umu.se/gui-sp">
<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>
@@ -47,5 +48,4 @@ EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
index b60dcaab..7e194f5f 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-01.its.umu.se/gui-sp">
-
<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://ladok3-demo-01.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
index 5adb5978..62026710 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-02.its.umu.se/gui-sp">
-
<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://ladok3-demo-02.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ a/lggwDHd7eCy/34Rs5nJw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
index 8a8ff2bc..a8b94fc2 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-03.its.umu.se/gui-sp">
-
<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://ladok3-demo-03.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ b/vkajQh9nHWAfPhgIOgkQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
index 89548799..b622f761 100644
--- a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-04.its.umu.se/gui-sp">
-
<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://ladok3-demo-04.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ P6m+IbDWFLo61vhr/Nkcmw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
index 0341a14f..ef892874 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-05.its.umu.se/gui-sp">
-
<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://ladok3-demo-05.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ ujZI0vVtQx+sTGMktkMb/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
index 4e750226..bc80b73b 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p00.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml">
<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>
@@ -47,5 +48,4 @@ vt1mkOs1sbw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
index 97a98a9f..0f63ad7c 100644
--- a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3test.its.umu.se/gui-sp" xml:base="swamid-1.0/ladok3test.its.umu.se-gui-sp.xml">
<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>
@@ -46,5 +47,4 @@ UEv/iCMoAJgGFRraTZFMDldSSu+MjBUuCi4kZaUImeVa0yXr7qBwZmYvdqgddDKO
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/maps.slu.se.xml b/swamid-2.0/maps.slu.se.xml
index 1fbfe85f..65bbf74e 100644
--- a/swamid-2.0/maps.slu.se.xml
+++ b/swamid-2.0/maps.slu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://maps.slu.se/shibboleth">
-
<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://maps.slu.se/Shibboleth.sso/Login"/>
@@ -42,5 +42,4 @@ QM0LY0RQjVj4+R+UdaRYQfizHG1rnKcEiRzi/mXYt2YXSjKuyvNUn6uc1GY9/3aJ
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://maps.slu.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://maps.slu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/mynetworkglobal.com.xml b/swamid-2.0/mynetworkglobal.com.xml
index 8fcb64e1..90541741 100644
--- a/swamid-2.0/mynetworkglobal.com.xml
+++ b/swamid-2.0/mynetworkglobal.com.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mynetworkglobal.com/simplesaml/module.php/saml/sp/metadata.php/mynetwork-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/portalservices.miun.se-shibboleth.xml b/swamid-2.0/portalservices.miun.se-shibboleth.xml
index d7993d8b..f3c6091f 100644
--- a/swamid-2.0/portalservices.miun.se-shibboleth.xml
+++ b/swamid-2.0/portalservices.miun.se-shibboleth.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portalservices.miun.se/shibboleth">
-
<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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,5 +67,4 @@ TeyoCQ24KR1X/NqeCJndNrh9MFFO1D14hF64NWpRKRybaB2lzrgIiIWvlw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portalservices.miun.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portalservices.miun.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/problem.math.su.se-shilsbboleth.xml b/swamid-2.0/problem.math.su.se-shilsbboleth.xml
index a3886996..eedade4b 100644
--- a/swamid-2.0/problem.math.su.se-shilsbboleth.xml
+++ b/swamid-2.0/problem.math.su.se-shilsbboleth.xml
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://problem.math.su.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Externa kurssidor</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">External course pages</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Kurssidor som riktar sig mot studenter utanför Matematiska institutionen.</mdui:Description>
- <mdui:Description xml:lang="en">Course pages dedicated to students residing outside of the Mathematical institution.</mdui:Description>
- </mdui:UIInfo>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://problem.math.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Externa kurssidor</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">External course pages</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Kurssidor som riktar sig mot studenter utanför Matematiska institutionen.</mdui:Description>
+ <mdui:Description xml:lang="en">Course pages dedicated to students residing outside of the Mathematical institution.</mdui:Description>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://problem.math.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://problem.math.su.se/Shibboleth.sso/WAYF/idp.hig.se"/>
</md:Extensions>
<md:KeyDescriptor>
@@ -63,5 +62,4 @@ BYg6EHJWH+STzIe9LWWBS1ielXYFLLbSz38sMKEvtlZw5rnUbhXvhw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://problem.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://problem.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml
index e021f9f8..23558a64 100644
--- a/swamid-2.0/rems.csc.fi.xml
+++ b/swamid-2.0/rems.csc.fi.xml
@@ -1,39 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rems.csc.fi">
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
- Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
- Location="https://rems.csc.fi/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://rems.csc.fi/Shibboleth.sso/Login2" index="2"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">REMS</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">REMS</mdui:DisplayName>
- <mdui:Description xml:lang="en">Resource Entitlement Management
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rems.csc.fi/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://rems.csc.fi/Shibboleth.sso/Login2" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">REMS</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">REMS</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Resource Entitlement Management
System</mdui:Description>
- <mdui:Description xml:lang="fi">REMS-palvelun kautta tutkijat voivat hakea käyttöoikeuksia tutkimuksen tietoaineistoihin</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en"
- >https://rems.csc.fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi"
- >https://rems.csc.fi/web/guest/tietosuojaseloste</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAJNkHpbnqskZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+ <mdui:Description xml:lang="fi">REMS-palvelun kautta tutkijat voivat hakea käyttöoikeuksia tutkimuksen tietoaineistoihin</mdui:Description>
+ <mdui:PrivacyStatementURL xml:lang="en">https://rems.csc.fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://rems.csc.fi/web/guest/tietosuojaseloste</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAJNkHpbnqskZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
BAMTC3JlbXMuY3NjLmZpMB4XDTEyMTAwNDA2NDc1M1oXDTIyMTAwMjA2NDc1M1ow
FjEUMBIGA1UEAxMLcmVtcy5jc2MuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
ggEKAoIBAQCti37oqpPuAfgsIAc7VwKA+3L99iuTlFG9jlGTJiurXW/ARwl5y8FX
@@ -49,60 +41,47 @@
0iqdiwFeKwjOlKALGVW92ihgU8uX3ScC6jCbAdPTu2m+NBO42pKNVYasHI0PBJmB
HCZKDHCPHeGmXn6ab0zU6GbvGrxAKWDwJNw9mgRfxKqvTpVI9hY8QOE4eAjH7UJz
c3E0G+pYuKCVKHVH6HOcuVL23IneYlhKtmz+Kw==</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://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AttributeConsumingService index="1" isDefault="true">
- <ServiceName xml:lang="fi">REMS</ServiceName>
- <ServiceName xml:lang="en">REMS</ServiceName>
- <ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
+ </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://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">REMS</ServiceName>
+ <ServiceName xml:lang="en">REMS</ServiceName>
+ <ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
Jarjestelma</ServiceDescription>
- <ServiceDescription xml:lang="en">Resource Entitlement Management
+ <ServiceDescription xml:lang="en">Resource Entitlement Management
System</ServiceDescription>
- <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonAffiliation"
- Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName"
- Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacHomeOrganization"
- Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacHomeOrganizationType"
- Name="urn:oid:1.3.6.1.4.1.25178.1.2.10"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
- <OrganizationName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationName>
- <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationDisplayName>
- <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>Janne</GivenName>
- <SurName>Lauros</SurName>
- <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Janne</GivenName>
- <SurName>Lauros</SurName>
- <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
- </ContactPerson>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Janne</GivenName>
+ <SurName>Lauros</SurName>
+ <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Janne</GivenName>
+ <SurName>Lauros</SurName>
+ <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/secure.urkund.com.xml b/swamid-2.0/secure.urkund.com.xml
index ff299183..0128bd06 100644
--- a/swamid-2.0/secure.urkund.com.xml
+++ b/swamid-2.0/secure.urkund.com.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:urkund:shibboleth:sp">
<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>
@@ -71,13 +72,13 @@ gEln3A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Peter</md:GivenName>
- <md:SurName>Witasp</md:SurName>
- <md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
+ <md:GivenName>Peter</md:GivenName>
+ <md:SurName>Witasp</md:SurName>
+ <md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:GivenName>Samuel</md:GivenName>
- <md:SurName>Otter</md:SurName>
- <md:EmailAddress>samuel@onposition.com</md:EmailAddress>
+ <md:GivenName>Samuel</md:GivenName>
+ <md:SurName>Otter</md:SurName>
+ <md:EmailAddress>samuel@onposition.com</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/services.ibistic.net.xml b/swamid-2.0/services.ibistic.net.xml
index a8e9afe4..ff27da2a 100644
--- a/swamid-2.0/services.ibistic.net.xml
+++ b/swamid-2.0/services.ibistic.net.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/sgw.africa-grid.org.xml b/swamid-2.0/sgw.africa-grid.org.xml
index 8bcea364..f8f4dc00 100644
--- a/swamid-2.0/sgw.africa-grid.org.xml
+++ b/swamid-2.0/sgw.africa-grid.org.xml
@@ -1,17 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://sgw.africa-grid.org/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">
Africa Grid Science Gateway
</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">
+ <mdui:DisplayName xml:lang="it">
Africa Grid Science Gateway
</mdui:DisplayName>
- <mdui:Description xml:lang="en">
+ <mdui:Description xml:lang="en">
This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
</mdui:Description>
- <mdui:Description xml:lang="it">
+ <mdui:Description xml:lang="it">
Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
</mdui:Description>
</mdui:UIInfo>
@@ -19,7 +20,7 @@
<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://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
</md:Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
<ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
<ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
@@ -79,36 +80,29 @@ j/MCNlE=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-
<md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
- <md:ServiceDescription xml:lang="en">
+ <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">
This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
</md:ServiceDescription>
-
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-
+ <md:RequestedAttribute FriendlyName="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">Consorzio COMETA</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Marco</md:GivenName>
- <md:SurName>Fargetta</md:SurName>
- <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
- <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Roberto</md:GivenName>
- <md:SurName>Barbera</md:SurName>
- <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
- <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
- </md:ContactPerson>
-
+ <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marco</md:GivenName>
+ <md:SurName>Fargetta</md:SurName>
+ <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+ <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Roberto</md:GivenName>
+ <md:SurName>Barbera</md:SurName>
+ <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+ <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.turnitin.com.xml b/swamid-2.0/shibboleth.turnitin.com.xml
index 9c1c2148..ecb1b0d2 100644
--- a/swamid-2.0/shibboleth.turnitin.com.xml
+++ b/swamid-2.0/shibboleth.turnitin.com.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.turnitin.com/shibboleth">
-
<md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitin.com/Shibboleth.sso/Login"/>
@@ -88,5 +87,4 @@ FfnY7V5wsSpLdk49lCnffBRVtwzF0tzt
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitin.com/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitin.com/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/shibdev.rsc.org.xml b/swamid-2.0/shibdev.rsc.org.xml
index 153a9faa..11e27ad2 100644
--- a/swamid-2.0/shibdev.rsc.org.xml
+++ b/swamid-2.0/shibdev.rsc.org.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev.rsc.org/shibboleth">
-
<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://shibdev.rsc.org/Shibboleth.sso/Login"/>
@@ -45,5 +45,4 @@ GV51mKkJSvO0CwKUTbSeK9Cn+Y0rAn2Hck2OojCaYY/SeNYkhe0vhQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibdev.rsc.org/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibdev.rsc.org/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/testshib.msacademicverify.com.xml b/swamid-2.0/testshib.msacademicverify.com.xml
index a6a7c7c3..793f45b7 100644
--- a/swamid-2.0/testshib.msacademicverify.com.xml
+++ b/swamid-2.0/testshib.msacademicverify.com.xml
@@ -1,5 +1,5 @@
-
-<EntityDescriptor entityID="https://testshib.msacademicverify.com/shibboleth-sp" xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testshib.msacademicverify.com/shibboleth-sp">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -8,7 +8,8 @@
</md:Extensions>
<md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data> <ds:X509Certificate>
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDVDCCAjygAwIBAgIJAJh4QX82u2pTMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
BAMTHXRlc3RzaGliLm1zYWNhZGVtaWN2ZXJpZnkuY29tMB4XDTEzMDMyNjEzMTIw
N1oXDTE2MDMyNTEzMTIwN1owKDEmMCQGA1UEAxMddGVzdHNoaWIubXNhY2FkZW1p
@@ -58,4 +59,4 @@ wWE+vceD2r7oFUYHr1E07cyX20HwNU1LL3TthPaNhs7M2ImLlYHapw==
<GivenName>Tushar Nene</GivenName>
<EmailAddress>Tushar.Nene@microsoft.com</EmailAddress>
</ContactPerson>
-</EntityDescriptor> \ No newline at end of file
+</EntityDescriptor>
diff --git a/swamid-2.0/ugit.se.xml b/swamid-2.0/ugit.se.xml
index 41c67d35..b9281661 100644
--- a/swamid-2.0/ugit.se.xml
+++ b/swamid-2.0/ugit.se.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ugit.se/sp">
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">UGIT</mdui:DisplayName>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net-idp.xml b/swamid-2.0/uninett-box-idp.nordu.net-idp.xml
index 5da7eed0..59dea35c 100644
--- a/swamid-2.0/uninett-box-idp.nordu.net-idp.xml
+++ b/swamid-2.0/uninett-box-idp.nordu.net-idp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://uninett-box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net.xml b/swamid-2.0/uninett-box-idp.nordu.net.xml
index f76c9c66..060317fc 100644
--- a/swamid-2.0/uninett-box-idp.nordu.net.xml
+++ b/swamid-2.0/uninett-box-idp.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
@@ -21,15 +22,15 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UNINETT Box</md:ServiceName>
- <md:ServiceDescription xml:lang="en">UNINETT Box</md:ServiceDescription>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">UNINETT Box</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">UNINETT Box</md:ServiceDescription>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
diff --git a/swamid-2.0/uraccess.se.xml b/swamid-2.0/uraccess.se.xml
index 81faff41..c505c461 100644
--- a/swamid-2.0/uraccess.se.xml
+++ b/swamid-2.0/uraccess.se.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uraccess.se/shibboleth-sp">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
diff --git a/swamid-2.0/webinar.nordu.net.xml b/swamid-2.0/webinar.nordu.net.xml
index 0731cef2..e1d2bdc1 100644
--- a/swamid-2.0/webinar.nordu.net.xml
+++ b/swamid-2.0/webinar.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webinar.nordu.net/shibboleth">
<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>
@@ -53,14 +54,14 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
- <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
- <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+ <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+ <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-2.0/wp.nordu.net.xml b/swamid-2.0/wp.nordu.net.xml
index f3be3a7b..889a41bd 100644
--- a/swamid-2.0/wp.nordu.net.xml
+++ b/swamid-2.0/wp.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://wp.nordu.net/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
diff --git a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
index fe50aa88..c5de4138 100644
--- a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
This is example metadata only. Do *NOT* supply it as is without review,
and do *NOT* provide it in real time to your partners.
-->
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-stage.ladok3.its.umu.se/gui-sp">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -28,7 +27,6 @@ and do *NOT* provide it in real time to your partners.
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-stage.ladok3.its.umu.se/Shibboleth.sso/Login"/>
@@ -84,5 +82,4 @@ WeqXrnHqvgkhvU9Xbex0UPo0tJ+WaKA=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-stage.ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-stage.ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
index 7f3aeb83..699c4843 100644
--- a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-utb.ladok3.its.umu.se/gui-sp">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -24,7 +23,6 @@
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-utb.ladok3.its.umu.se/Shibboleth.sso/Login"/>
@@ -80,5 +78,4 @@ HCJqLLaJwhW98zEnNf0DCRdbDeEV1hoW8kZG9l3Mb1K6mOBCL/SUPDb9CzJ7timi
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-utb.ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-utb.ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.akademiskahogtider.se.xml b/swamid-2.0/www.akademiskahogtider.se.xml
index b7a44b74..bc406b7b 100644
--- a/swamid-2.0/www.akademiskahogtider.se.xml
+++ b/swamid-2.0/www.akademiskahogtider.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.akademiskahogtider.se/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
diff --git a/swamid-2.0/www.ifmsa.se.xml b/swamid-2.0/www.ifmsa.se.xml
index aa831e70..ab70dc30 100644
--- a/swamid-2.0/www.ifmsa.se.xml
+++ b/swamid-2.0/www.ifmsa.se.xml
@@ -1,16 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ifmsa.se/sp">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
- Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- </samla:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ </samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ifmsa.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -57,7 +54,6 @@ X40wJ5KGvRmsxTM5VbkQ8wS7EWuIkQG/iXCyD+b1BExCsuXvX3nN24bsBLUtV8wE
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ifmsa.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ifmsa.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
<md:Organization>
<md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index f917cd50..5d95ce49 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mit.ladok.se/gui-sp">
-
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -25,7 +24,6 @@
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
-
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit.ladok.se/Shibboleth.sso/Login"/>
@@ -80,5 +78,4 @@ hiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-
</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 09dd4aca..8607d22d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -64,4 +64,13 @@
<xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/hashog.umdc.umu.se-8087-HTH.xml"/>
<xi:include href="swamid-2.0/problem.math.su.se-shilsbboleth.xml"/>
+ <xi:include href="swamid-1.0/expert.antagning.se.xml"/>
+ <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/>
+ <xi:include href="swamid-1.0/www.universityadmissions.se-aws-sp-en.xml"/>
+ <xi:include href="swamid-1.0/expert.testa.antagning.se-ecs-sp.xml"/>
+ <xi:include href="swamid-1.0/www.testa.antagning.se-aws-sp.xml"/>
+ <xi:include href="swamid-1.0/www.testa.universityadmissions.se.xml"/>
+ <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/>
+ <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/>
+ <xi:include href="swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
</md:EntitiesDescriptor>