summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2019-03-18 14:59:02 +0100
committerLeif Johansson <leifj@sunet.se>2019-03-18 14:59:02 +0100
commit43732340634ee7e13a53340825e14f534e004b98 (patch)
tree2131ab7cf1b8cbf792218d54a3ce0329cb31b8f7
parentace7b704f3f7dea5f1a67a8f9b324bd3ff679ed1 (diff)
parent3610b9d8f630f424185bf297e5efb81c61f45a1c (diff)
Merge branch 'master' of git.swamid.se:swamid-metadata
-rw-r--r--swamid-2.0/adfs.nrm.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/adfs.rkh.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml32
-rw-r--r--swamid-2.0/adfs.umu.se-adfs-services-trust.xml12
-rw-r--r--swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml80
-rw-r--r--swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml3
-rw-r--r--swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml43
-rw-r--r--swamid-2.0/fs.liu.se-adfs-services-trust.xml16
-rw-r--r--swamid-2.0/fs.vemendo.net-adfs-services-trust.xml58
-rw-r--r--swamid-2.0/idp-test.comanage.sunet.se-sp.xml65
-rw-r--r--swamid-2.0/idp.chalmers.se-adfs-services-trust.xml13
-rw-r--r--swamid-2.0/idpv3.lu.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/int.mp.uu.se-shibboleth.sso.xml48
-rw-r--r--swamid-2.0/kau.instructure.com-saml2.xml94
-rw-r--r--swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml57
-rw-r--r--swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml66
-rw-r--r--swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml57
-rw-r--r--swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-06.its.umu.se-gui-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-06.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-07.its.umu.se-gui-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-07.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-08.its.umu.se-gui-sp.xml82
-rw-r--r--swamid-2.0/ladok3-demo-08.its.umu.se-student-sp.xml82
-rw-r--r--swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml133
-rw-r--r--swamid-2.0/login.it.liu.se-idp-shibboleth.xml11
-rw-r--r--swamid-2.0/login1.fhs.se-adfs-services-trust.xml9
-rw-r--r--swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml101
-rw-r--r--swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml2
-rw-r--r--swamid-2.0/student.utbildning.ladok.se-student-sp.xml36
-rw-r--r--swamid-2.0/sunet.instructure.com-saml2.xml93
-rw-r--r--swamid-2.0/test.valda.uhr.se-shibboleth.xml95
-rw-r--r--swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml15
-rw-r--r--swamid-2.0/weblogin.kau.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/wiki.its.uu.se-shibboleth.xml28
-rw-r--r--swamid-2.0/wiki2.its.uu.se-shibboleth.xml68
-rw-r--r--swamid-2.0/wikiu.its.uu.se-shibboleth.xml68
-rw-r--r--swamid-sp-2.0.mxml10
-rw-r--r--swamid-testing-sp-1.0.mxml20
47 files changed, 2449 insertions, 126 deletions
diff --git a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
index b99ba363..f7916ac0 100644
--- a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
@@ -24,14 +24,14 @@
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC2DCCAcCgAwIBAgIQS7Oimt5pOLBKm533iMH6oTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLm5ybS5zZTAeFw0xODAyMjcxNjA2MDhaFw0xOTAyMjcxNjA2MDhaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMubnJtLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlDpmsoie7AzKRhtk/oeriY3Z0IGO1mqNB8J8WM3bmP3RckW3ysxntZD0O871vGRIorO7XrcPsHw8pqrTFwmeE5rbw8R6RXfE9SBYunS0ut0CJkS7SgIJOz47UdUTpPo3il3YBjHt8kBGpmYt0OPOZqjqNn0W+tkl2nqWgSciCHZQ7RODkiEwQlzPSJdWZuOoko5hDXDQxO3zWXiRw1dmL5Wb2rL/jpaycuXrytX0anEqGOAyQDEiwjRx1iZaennQMeDKBC1pfAlMwRRl01vIxIPcUIaX+usivxwJcxqWQcQr0gn8jkzUCohm3q8bsNQxxcV17f7GOrfBOUsF3m9ydQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBIXddnACon5fKZWxQrThITsXk3R54FNfqIl03NRj+cIuXCzqTRQNTfZK/G4Q2xeLKdq6nQDERL9PoaKyii2FaN13tyczabBq1RG6rLTLpkomsiudKDIvUstOu13VdbbZzqlQFAl53FxG77l+GhbLKlZCTh1k3T6M5yhDRoxVWivWNazZ4tiGYbqw2e9wjEOCiC5tcfDhDQ0w+0i7wS649NK/orOhBVln2NHkfXpo6usE7aawovj5g9k+fRL5hbTmtu7cp/EMs9NDdLMLOnh8Spi53mJ2dzJv8V2Izg9LL+wht2e83bRB/tKJaZEmkIcpy7N0FKWH+D0L+ZxbiMUgQI</X509Certificate>
+ <X509Certificate>MIIC2DCCAcCgAwIBAgIQZcgpIT1y9YVHkSdazFD+WzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLm5ybS5zZTAeFw0xOTAyMjgxMTIyMzhaFw0yMDAyMjgxMTIyMzhaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMubnJtLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv4WtFd5fR6lWUS5sZg2St1Cgsws9b/al+zM4Kbz4tXavrDhiG94vDOpVc6dUvZ7GXFMCtP+UoIfPSpWWwuFrhx7JrlfH5Qolxt5/vFpmbWg41w7NkrgBeeSYCscC/3rP1vFITiWnJZKVG53k1yrVdlz5S6jNI1Y+d5KJdWCvr4u60jsNUPWt5yqmHAaVRLGX5kaZbmdZC2yqDb0nKmwiTTG+jZOJq0SSilMVNpJda4kjZu1EW5I84TlunHmFf56v3CryKYbzrRhAvzXJitGchNVrUhwywivA6YTl72u0k44vKPApVfoZXwuKv0P4o8cV1fgPAQYS5mwQEMmHiLlD4wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCtufzRfu0P+zQJTIeTA883R7lWCYLfty+BhRIWj6IccPhMStQY854iFWXWY3zJsxvgBpXkvJhQ/W1Z4XlGdF/ayfj0IUGKvdK67/eBGqfQTS79MKR9CqG1phpGO0dk8U/mTvEMInr5om2rLaPQzwGTGXUxlogZciL+50hmMezSQeptVkVSSaVgdXIEumZSXjjZKTu0Hy/nkMi2wLy4Wa82zDgyXqwPEdF3aOaAkD456EYbBpIva1gHYrnkDafi6/aeHAXh8gAKBmcxQB9ou3ml4YJGi/hblJgAq7yRPkqvtR+EH6o1ufDzM5W+NxgUiDt6duf5SnAVqVbEvGY8owXW</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC0jCCAbqgAwIBAgIQKpv3EnEyE7tJY2jmxZ5dVDANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLm5ybS5zZTAeFw0xODAyMjcxNjA2MTBaFw0xOTAyMjcxNjA2MTBaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMubnJtLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzwL6SjaOapYtt7hzW8wLsixhPvD3eK9zZWKBNyxXXTGwIelpeNd3ivyUQjlyOIv8bUiPQHUczbGwnni61KdOZ39LyrfIyZxH+VBOgaML4fYwaKLcNKOxsoU5seaTPN3PgiqK2C62sxYRHExljBE9+E/xm8yIdSCvZmdReXI5hsqNYwJ8TaSqDLncPdeyrER6kg7zkow9NQCUeeyvzOm7Mmh+bwrEYQ6260LvnfwDlaRmI7a/NMc+gBc5hdW79ipy1JYTLLxj+Rwa5rZlhmNIFp0qVr6wMQs5Cf+lsnm4ycboxOHwa6HA24OaUE/td1r7FWVtI6zVOvExFio9w/nkRQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAvHe7BGEdKXqQUSfRo85+9Kba8TbaJrOM4ER0BeQd6l5yTEOgNq/aVkUox/DCfxWS1BDwMNl1qBDpHOZckqDdiAOyI41gOuqGtv+ImJVr6JmQ8nYaVlY5/JPOieiraJa3s8wwpr4qjf7JUh1YRgwHvZjoi1hnsF9GdOqgB1TVLUSRriKhO9uoTIADdzxUljhYfHnKKixZo6Saz+3UjZV0biKL1l/6/B8U3iGhuNtrMcDiTHMWkN0OMDBPjd7s6aTeXiDTz12iL2ORKIBW9TmW1Jgl5mqY+4kc7oCOMtVONXwiP6FaZN6b9Rt/0TLZYp5yWOdYUK25WhIu55S86RFCH</X509Certificate>
+ <X509Certificate>MIIC0jCCAbqgAwIBAgIQVCvsRARIW6hDxO1UwRw3mzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLm5ybS5zZTAeFw0xOTAyMjgxMTIyMzlaFw0yMDAyMjgxMTIyMzlaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMubnJtLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlpJnnfmSGNQb22BCp/r3D6Ndl0YtvXZOyPQjU9eaV0/UrYGmFz6rSalzbVbwGw4ZrL8mjjB2Ldg5CiFGLTdkJAogJ/51WoAazlfo1/ucw924Sv9wqlA+drfENv5tSdIUXw4S/VQMrLpbpH2Dg4iVbawJNCImh1njJT90xtSXqCoV8sld5S2tO31MGDOmNiC7QqzFTfNXFQK/r0F0/wF07kjL4iX33t2+Qmk3naM4OdtxZ0zlIGy8xwu66RTBL0jvJn7D7yS1Rp69kkvYjexu2pDOJ/y3+1S3Gz8bp6UJtf+4/Ah/CzLeQ5RBpZ8NIJnl6f/MXsMhzqJjAIjaHFy8wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB4wiNEDKtC0NDj64fy2NWjjjbEiy5vuoHvFz2YqDkapF8l5pBtpuorsAEyEFiG5Uq3ke/0cZ9abWeFIx1H3f7opXelDS+au1MizUeAEj2RBXZO/g8JfsSe6LzXQoPB+jBzAAUop0R6h4xnmbrwJCab+Mi/TAJxpsXdqFEYE8iuCiHqCHf85+kGfMaqpDiR3mPoAuO8tP4lp96Dct1s9l3Vv8UBXwDJwcU/pKo193uDeyfe5iz6OddpKkH4p7zV9RXwvfFVN3i5mXByVh4RYn9v3mxgn+574AEHJVkxIsY+rbvPbOrp5t5/ElWj8cNL65d7kzBoPeZ6Brl3/P4xy4uT</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
index 08c91918..d85bcf9d 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -15,14 +15,14 @@
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC2DCCAcCgAwIBAgIQGautI+pz9adEzsYcS8EfjjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLnJraC5zZTAeFw0xODAzMjEwNzMwMzJaFw0xOTAzMjEwNzMwMzJaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyNEZS8D8pFyX4ZFo/+Vbsik653WMtnH6KdnMFHrKnuOXqDoxs5S4kR9PbLD1NSqOrTYR0SLRsa0NitMTiicM5ateieUn5xcnb3bu91YJ/+EoR4TqYY/+AZR4Mi6pTqiCGTvzOxTyXxpCWJIBlTBq7OvhVTel3tx6qfcLdhOmIcafL7qLVBV8csrwbIjcWNgItiDP7XMoogut5R/z4qyjA+KJTsKX/BI3DNIWTc5HuNJb54DEXnzE8Bawl4D0tUDNm5ogXpkGirTLT6N+hQ9L87/swlbK+Dj5qTdvtXHOhltLofI9FjS0/0q4XX7gHe9jm1/FzpRp1197DzW9K/ZvgwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAifuxnEGWhesWEtO7Gfn7M53GKM68i1A883NvmrtJ88MCYRU9p+sLVFDUpaevxu9uy7blr+cSeIDP6rhJn2xddMbfGj+zo/+KO4ZOoDLzcVmkLOg0utMVKzDgo/0lFPDabQNPsb6uccQrwFYNVb/gK/u6dNVc0Sh8CUU//uBOcCiVUqXCKXV+5AhVN3JUt2x8z9b8reHQDu+WqfvNGgaMrxU3/I6WEK5DGz9/hpjoD1z9VbPmbHlsyKf8MLLAP10LeXt2NJphHOIhRqoTndzNjDYjrOwGtqXO7UsO2qlc5xRla4gtx8hFrsDAuVFqRFR3CB7rjKGmZYzCM8PIUGH4h</X509Certificate>
+ <X509Certificate>MIIC2DCCAcCgAwIBAgIQFkFnarXS36lHIDl2yABKdDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLnJraC5zZTAeFw0xOTAzMTEwOTA1MDVaFw0yMjAzMTAwOTA1MDVaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmb89WTgjzqT84VJAZJBpPhxfOgtInxI9bTm8lg270Sf2OjJalL6KwKSwSdXuUxKmmAE2lI37hjEzW0Szbl95revEe/uXi96piUs3utT2BWD3DxVyMoa1Iwweg+weIVy/ygTvJr81AngQfCfKEXH9lfBd+r69Stvy3TmaabelREZ9ctM38FzdsuMMJneQpdThVjrLx9Lhi3+78MmYvxGKaNKQbWS9rOEFMwPpiFxexoYNRHFoB6yhpxwEjttBHtxSOvToTW32tnvWfmntcEwMYzmy6F2VD0UtTSme2JFpVRwD8N72GXtoNA4tpOvl8Zj8gTWi+sX+Avdt2hYT4OxgOQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBO+A5TTkSeCb8SYu4MQw6CTeRZ7vQWQZvO7INZVoSKfsaQmIh9mVg+4epZ5wWzEjx92Mtq59NJ5kEsqgJ4hCUZQgwHieICvpXVWkUYOXnLjowkbtc3auQGUOTkpDKWabmvlCM29x66/qh/CAB0S+B4kJbIKRvgrhdtzhhFlTaPyXXGfia2rP+bYzjWnaQ4w1cvV2NhBEqOhmCaiDffELvV1vZp2BdJNfBHIETNQju/x83i0TvtpnbcR5qz76ynvU3jGpZ3XNM9WBbC1tK3qqqz58Km9SQy+/wjgllKSsbNG9APSy+NVbK8nj3B9HDxRWY18YGSH/hwpTqUmyDn88/k</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC0jCCAbqgAwIBAgIQRNcBkwUH57FBO/0iKmJ2dzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xODAzMjEwNzMwMzNaFw0xOTAzMjEwNzMwMzNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PBujoU9dPCDLdMTlLCOkog78u1/3LQVYX2Y/daoIKFDCdhb4zMNjHUhy/4o+uM7fqXb8+ZQRjfC10DW8gBBUuTX1Du6hSitc6et+SePw7WTw3NxzLiFUmBrBwLN/WKjVLKTX6NXgaw15jD9uabI37DZDyu93e1RoLo0imiNLTRxyQs4QLpcDPR0GH2kqHusxbpZOMAsEfoJbKWFwFrSBUyznodb0f/ABxle5lXIvsfIg3uXCg61baBDoaHd6qEy+syfvlJYYqFk76JwgAqkMIWa7OWa9c2jzJJuYGmZI7u4erNtt/YYIli0x/Eoz4KJkl0Nt79JjvmyIGlI+yAObQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJD/8kZuSUs3x7j9g4CCD33wSpjb6rRy9ghcM2i8LoaWZLtYOBzNPfRtLbN6UZRUHwWxxgT0go4QRbdoZt0z0phJ0zEqbTZO1ufGFX9f1Yd53WYYWGKmUvVSbNRm4eFOQK781aveoum/3VKz7cZZOcq/unQiBuBfXG6/SAnfHRjcXwXGLzr/RdRRbLpLkr5iPnJjtVPeGYGhK/emoIABRhtMkdIbZTHcutG0vjkG/SWxKWNt0krmLphVYItvjU/trIqcy9c0CfrnhpyNR3B4BTkF5EOH8PmMu1up0HTYZ2rCKTxeE4Rf+fNMvu8mGcuYQkmtok72zts03aa5Fnat/X</X509Certificate>
+ <X509Certificate>MIIC0jCCAbqgAwIBAgIQTOvBukc0zoxBlP0hDta7QDANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xOTAzMTEwOTA0NDNaFw0yMjAzMTAwOTA0NDNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq/TD9x7zmICN6zX9SJKXbP2MHrF4kJcHDAFo+deggRQAl4bYDAcEL/cR9mmaUbcdsXrgWgq9xteuOm6Myz6SKY4Q/QPYwF2MfNCTkLYRp4dq2xoS/m9HjnU3saCxvbQegKdp0gd/9maErlxKRZesRb+rvrbw6zNHv9J3JCdrLsVEfaj0+FBBFfy4eOEnjZ1YkI4syZlbDVvzRB/zdBkggJMCpYwwklhW+8fvWjm7MzuV42KTCWtlb1zWEcZSiAgvdZy1zN5+WlfTQe+2FbJ59IwJcDlTUxni9dcWn8gwBZQOBlp17peeF0lnYpM1cjXOknxWLds09Fo/kW9QgPn8aQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA2li7w6m27MVeVsTVye6cc4lGSzxxVu5F61Xib1sUPR93xBaraykqmgX3uteQevDyZecTYvdzKPZZvQdOw0Dh2Jvz1zoU29QVIkwFpdUP5jNVa64/zYO5cDyuRrTjqDuQxAdMm1j8CTrA57ZU8BA6iseVGVCMBvs8YTEVD8wI+8VhQuwRTwEmx+gjC+fHaHLgjm/s/Ih9FOhYN4CDW3+8zQNW0GPceMW0FDFsdlVa/dg6hVMUY9B2bNkYSHT9rjYGCbOeeRV1CvhIDf4SNuL9xNXDdlV8VDyHGMFughO/KebiXPrXYSQnyrfQ1tsDdPs+JcsKKOQ9xm9hnCRVVP0n5</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
index 48fe0929..3276498b 100644
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -7,14 +7,10 @@
<mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
<mdui:Description xml:lang="en">Umeå University</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="sv">
- https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/
- </mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">
- https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/
- </mdui:PrivacyStatementURL>
+ <mdui:InformationURL xml:lang="sv">https://www.umu.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.umu.se/english</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="encryption">
@@ -46,22 +42,14 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">
- Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).
- </mdui:Description>
- <mdui:Description xml:lang="en">
- Identity Provider for employees and students at Umeå University (TEST).
- </mdui:Description>
+ <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Umeå University (TEST).</mdui:Description>
<mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
- <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
- <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
- <mdui:Keywords xml:lang="sv">
- umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
- </mdui:Keywords>
- <mdui:Keywords xml:lang="en">
- umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
- </mdui:Keywords>
+ <mdui:Logo xml:lang="sv" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-se-te.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-en-te.png</mdui:Logo>
+ <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>umu.se</mdui:DomainHint>
diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index cadd2208..99b8a027 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -16,10 +16,10 @@
<mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet.</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for employees and students at Umea University.</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
- <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
- <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://www.umu.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.umu.se/en</mdui:InformationURL>
+ <mdui:Logo xml:lang="sv" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-se-te.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-en-te.png</mdui:Logo>
<mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
<mdui:Keywords xml:lang="en">umu umea+universitet umea+universitet umea+university umea+university umea umea</mdui:Keywords>
</mdui:UIInfo>
@@ -57,8 +57,8 @@
<OrganizationName xml:lang="en">Umea University</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Umeå universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
- <OrganizationURL xml:lang="sv">http://www.umu.se/</OrganizationURL>
- <OrganizationURL xml:lang="en">http://www.umu.se/english/</OrganizationURL>
+ <OrganizationURL xml:lang="sv">https://www.umu.se/</OrganizationURL>
+ <OrganizationURL xml:lang="en">https://www.umu.se/en</OrganizationURL>
</Organization>
<ContactPerson contactType="administrative">
<Company>Umeå University</Company>
diff --git a/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml b/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
new file mode 100644
index 00000000..34b0ccb8
--- /dev/null
+++ b/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://authdub.bridgeapp.com/saml/metadata/fcadf6cd-b759-4923-bf03-b4d41bde6f79">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:DigestMethod 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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init">
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdub.bridgeapp.com/saml/callback/fcadf6cd-b759-4923-bf03-b4d41bde6f79"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Kompetensportalen (under utvärdering)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lund University internal training</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Lunds universitets system för internutbildning</mdui:Description>
+ <mdui:Description xml:lang="en">Lund University's system for internal training</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDUDCCAjgCCQDJXlCHZxUSBTANBgkqhkiG9w0BAQsFADBqMQswCQYDVQQGEwJVUzENMAsGA1UE CAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkxGTAXBgNVBAoMEEluc3RydWN0dXJlLCBJ bmMxGDAWBgNVBAMMD2luc3RydWN0dXJlLmNvbTAeFw0xODA5MTkxNTM1NDJaFw0yMzEwMDMxNTM1 NDNaMGoxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5TYWx0IExha2UgQ2l0 eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzEYMBYGA1UEAwwPaW5zdHJ1Y3R1cmUuY29tMIIB IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxG4wOVwZ/TK94EiauNeC1sHaGuhHI5P5n+17 wCI0ETMubpy5ZnKSb+h0gWurEwGBQtAPHY+58NK5ZgXPybwgsmBjYyh8oqWZzwoZv4cRhQdJPVpR SOXbZA0djizCC/YAYP2E4lFRYRNrPFNMey/+/u1xo4ON/qsxcLjuhlS7q9xPd5DHhABC8aWm9J0l E6ld001w38Mvb4xaFdNuk/VjqsxgtNcGebQFffspnUZQ3ifA7LDE3VO6LgbfnGSgHankhKGruTMD yMMaRBCLz8AIq+xVyV1UUAx6dL5gGnCOs0H7voggeXN89ICtfQmU0B9wqgwIndV26xD8GEOBnJvq lQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBiKNtyKZAIZd/LMxUcdchQT5ZOaHiyvhD/26oH9jdr W1dRW5sI8f5pZPTrAbYCjsgNCpHfB8xhQCq7zPLd1sZPj3eLD8jm42VikNF3eCIpNP1WkempaGlb KPg6I2UlkjJ5gocBZrKH1H45sL4aOH0VUoEy8rImRoo7nhwh3zq4g/JbcoB6ysBJjwWl6QxdBxA5 J5trm8eeGIe+EUMK3DGcyhyGYKW007JZhuVCjWb9pkc8VBp2+Rt0CeRBNFlYqE8r5tEhh8yM42Ac kUd6vRtrSM/hacrpCEcCepidHA1ssxFzchO7CNwhN0nRife5w4TeLApGiXHqxbjSrnQOCcM0
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDUDCCAjgCCQDJXlCHZxUSBTANBgkqhkiG9w0BAQsFADBqMQswCQYDVQQGEwJVUzENMAsGA1UE CAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkxGTAXBgNVBAoMEEluc3RydWN0dXJlLCBJ bmMxGDAWBgNVBAMMD2luc3RydWN0dXJlLmNvbTAeFw0xODA5MTkxNTM1NDJaFw0yMzEwMDMxNTM1 NDNaMGoxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5TYWx0IExha2UgQ2l0 eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzEYMBYGA1UEAwwPaW5zdHJ1Y3R1cmUuY29tMIIB IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxG4wOVwZ/TK94EiauNeC1sHaGuhHI5P5n+17 wCI0ETMubpy5ZnKSb+h0gWurEwGBQtAPHY+58NK5ZgXPybwgsmBjYyh8oqWZzwoZv4cRhQdJPVpR SOXbZA0djizCC/YAYP2E4lFRYRNrPFNMey/+/u1xo4ON/qsxcLjuhlS7q9xPd5DHhABC8aWm9J0l E6ld001w38Mvb4xaFdNuk/VjqsxgtNcGebQFffspnUZQ3ifA7LDE3VO6LgbfnGSgHankhKGruTMD yMMaRBCLz8AIq+xVyV1UUAx6dL5gGnCOs0H7voggeXN89ICtfQmU0B9wqgwIndV26xD8GEOBnJvq lQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBiKNtyKZAIZd/LMxUcdchQT5ZOaHiyvhD/26oH9jdr W1dRW5sI8f5pZPTrAbYCjsgNCpHfB8xhQCq7zPLd1sZPj3eLD8jm42VikNF3eCIpNP1WkempaGlb KPg6I2UlkjJ5gocBZrKH1H45sL4aOH0VUoEy8rImRoo7nhwh3zq4g/JbcoB6ysBJjwWl6QxdBxA5 J5trm8eeGIe+EUMK3DGcyhyGYKW007JZhuVCjWb9pkc8VBp2+Rt0CeRBNFlYqE8r5tEhh8yM42Ac kUd6vRtrSM/hacrpCEcCepidHA1ssxFzchO7CNwhN0nRife5w4TeLApGiXHqxbjSrnQOCcM0
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>
+urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+</md:NameIDFormat>
+ <md:NameIDFormat>
+urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
+</md:NameIDFormat>
+ <md:NameIDFormat>
+urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+</md:NameIDFormat>
+ <md:NameIDFormat>
+urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
+</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdub.bridgeapp.com/saml/callback/fcadf6cd-b759-4923-bf03-b4d41bde6f79" index="0"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Eskil</md:GivenName>
+ <md:SurName>Swahn</md:SurName>
+ <md:EmailAddress>mailto:eskil.swahn@ldu.lu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 46 222 1323</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Maria</md:GivenName>
+ <md:SurName>Hedberg</md:SurName>
+ <md:EmailAddress>mailto:maria.hedberg@ub.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>LU Servicedesk</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 46 222 9000</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
index b92f0e3a..9e91d23a 100644
--- a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
@@ -1,9 +1,6 @@
<?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://demo.weblogin.uu.se/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
diff --git a/swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..796bf4d7
--- /dev/null
+++ b/swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,43 @@
+<?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://dev.ladok.se/wp-content/plugins/simplesamlphp/www/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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok test</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok test</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Detta är en testsajt för ladok.se</mdui:Description>
+ <mdui:Description xml:lang="en">This is a test site for ladok.se</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDrDCCApQCCQDPFO0U5Y4uNDANBgkqhkiG9w0BAQUFADCBlzEVMBMGA1UEAwwMZGV2LmxhZG9rLnNlMRgwFgYDVQQKDA9VbWVhIHVuaXZlcnNpdHkxDDAKBgNVBAsMA2l0czENMAsGA1UEBwwEdW1lYTEVMBMGA1UECAwMdmFzdGVyYm90dGVuMQswCQYDVQQGEwJTRTEjMCEGCSqGSIb3DQEJARYUQW5kZXJzLnByaW50ekB1bXUuc2UwHhcNMTkwMTI4MTIyNjE5WhcNMjAwMTI4MTIyNjE5WjCBlzEVMBMGA1UEAwwMZGV2LmxhZG9rLnNlMRgwFgYDVQQKDA9VbWVhIHVuaXZlcnNpdHkxDDAKBgNVBAsMA2l0czENMAsGA1UEBwwEdW1lYTEVMBMGA1UECAwMdmFzdGVyYm90dGVuMQswCQYDVQQGEwJTRTEjMCEGCSqGSIb3DQEJARYUQW5kZXJzLnByaW50ekB1bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuW+hOM9zAn2gbhjZvS2Huo09NEao1w4N2sEI5h5O3r/DsIukEuB+s1Mq5RVrhuO0p4i3+VovAhh09kgrinMx6vwNWNEkUeWZVGs2NPrXnfUaBBTaeaLg11W4h4QvEFGxlFPAxjjGooLmOUkNZH4vF+nTWg4AT0csz9UwLHfkdm5XFcZ2x/uokPeQZO0HTBeibOMnvIBPdv/ogUmoT5puqF9WaDlsCpdR9sku1PZp24lVIIgmjOHhG7asCaBhgpFe8ZB52/+DTfSh9DGRwSera2uIZ+KfsuElc/K02Bkhj5L/nPJ9fUrz0OdMmg/F+HaeztlegPeNsqXPz/Qav6k4DAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGoe89zhRMkdsqGe9opj5s9tE/cYrqkbmja8speKyAZJUDDWspwfBQb5NOMLin4aL6p5XOodOrn4W3V9W94iXcO1gyn9ny+N8WLEUqOexoJCk+DblrGy9up1hQAyEZSk2F9SY+0YoQ5/fBpzMyrl+B7bboQg6NurAeCPZqtVMkzGKMoSVZdagYVW7nkhCwdVw0tvA/6OFJkmEI1bvzMO2hR6KHsu+6Ignwx/7hT1SSe3qsytpKf63P8qRGf/iCUdgbAzZ0/KRHwcPH37PwR6d6ORpYcfXo3Rfo9k6yVKSHQfwvWNYuEsnwoJrjdT1OHAOaE+7gpNfIqRNdoYSKPxQDU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDrDCCApQCCQDPFO0U5Y4uNDANBgkqhkiG9w0BAQUFADCBlzEVMBMGA1UEAwwMZGV2LmxhZG9rLnNlMRgwFgYDVQQKDA9VbWVhIHVuaXZlcnNpdHkxDDAKBgNVBAsMA2l0czENMAsGA1UEBwwEdW1lYTEVMBMGA1UECAwMdmFzdGVyYm90dGVuMQswCQYDVQQGEwJTRTEjMCEGCSqGSIb3DQEJARYUQW5kZXJzLnByaW50ekB1bXUuc2UwHhcNMTkwMTI4MTIyNjE5WhcNMjAwMTI4MTIyNjE5WjCBlzEVMBMGA1UEAwwMZGV2LmxhZG9rLnNlMRgwFgYDVQQKDA9VbWVhIHVuaXZlcnNpdHkxDDAKBgNVBAsMA2l0czENMAsGA1UEBwwEdW1lYTEVMBMGA1UECAwMdmFzdGVyYm90dGVuMQswCQYDVQQGEwJTRTEjMCEGCSqGSIb3DQEJARYUQW5kZXJzLnByaW50ekB1bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuW+hOM9zAn2gbhjZvS2Huo09NEao1w4N2sEI5h5O3r/DsIukEuB+s1Mq5RVrhuO0p4i3+VovAhh09kgrinMx6vwNWNEkUeWZVGs2NPrXnfUaBBTaeaLg11W4h4QvEFGxlFPAxjjGooLmOUkNZH4vF+nTWg4AT0csz9UwLHfkdm5XFcZ2x/uokPeQZO0HTBeibOMnvIBPdv/ogUmoT5puqF9WaDlsCpdR9sku1PZp24lVIIgmjOHhG7asCaBhgpFe8ZB52/+DTfSh9DGRwSera2uIZ+KfsuElc/K02Bkhj5L/nPJ9fUrz0OdMmg/F+HaeztlegPeNsqXPz/Qav6k4DAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGoe89zhRMkdsqGe9opj5s9tE/cYrqkbmja8speKyAZJUDDWspwfBQb5NOMLin4aL6p5XOodOrn4W3V9W94iXcO1gyn9ny+N8WLEUqOexoJCk+DblrGy9up1hQAyEZSk2F9SY+0YoQ5/fBpzMyrl+B7bboQg6NurAeCPZqtVMkzGKMoSVZdagYVW7nkhCwdVw0tvA/6OFJkmEI1bvzMO2hR6KHsu+6Ignwx/7hT1SSe3qsytpKf63P8qRGf/iCUdgbAzZ0/KRHwcPH37PwR6d6ORpYcfXo3Rfo9k6yVKSHQfwvWNYuEsnwoJrjdT1OHAOaE+7gpNfIqRNdoYSKPxQDU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ladok.se/wp-content/plugins/simplesamlphp/www/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ladok.se/wp-content/plugins/simplesamlphp/www/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ladok.se/wp-content/plugins/simplesamlphp/www/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ladok.se/wp-content/plugins/simplesamlphp/www/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ladok.se/wp-content/plugins/simplesamlphp/www/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>mailto:anders.prinz@umu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 5be0e15a..dcbb5e7c 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -21,10 +21,10 @@
<SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Linköpings universitet (ADFS)</mdui:Description>
- <mdui:Description xml:lang="en">Linköping University (ADFS)</mdui:Description>
+ <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">Linköpings universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Linköping University</mdui:Description>
<mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
@@ -91,8 +91,8 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
<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 (ADFS)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
+ <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:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
@@ -169,8 +169,8 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
<Organization>
<OrganizationName xml:lang="sv">Linköpings universitet</OrganizationName>
<OrganizationName xml:lang="en">Linköping University</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.liu.se/en</OrganizationURL>
</Organization>
diff --git a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
new file mode 100644
index 00000000..fa71e86e
--- /dev/null
+++ b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.vemendo.net/adfs/services/trust">
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Pythagoras Web</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Pythagoras Web</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Hantering av information relaterad till byggnader vid Lunds universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Management of information related to buildings at Lund University</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="encryption">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIC3jCCAcagAwIBAgIQaMSNyxA5n4VBKwc1kO+5OzANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBmcy52ZW1lbmRvLm5ldDAeFw0xNzExMjUwMDExMTdaFw00NzExMTgwMDExMTdaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGZzLnZlbWVuZG8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1cXWTuawK3E5m2kj1uUz7SVTB6X4aNglBVzUoMuS5zzuWKh8YIExlody+/+QMm00emYdnzkkxvvqWyYSZhgtj3CdRpaj/NVjIc7M3kakQj59gw76qFGehKmutb1al9RqrL7l6T9Fa4RJkTh6cCmdzU8lh2CKZPQrbnYPmh2P+BLpzIemqXNJy6HFr/usNB2KJQcqrR0roIdDm7o4qLUEYEYhqqlw0YdClTk0YACpwAT4XfSNes3XCHu+n53zK8k+HFRBWw0RC1h6MQwPIVL3FqsjxECeLeXQ0zZBGOCZZagh0muwUJjt+A6ynnjnDCTwAQhJ2/YEOOrdB0F03RxtQwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBNa+r2L5Yszr8EnV9kIzLVPXS5pzKBiMFj3ZU11ycZ9o5xrzenyqsVH2XMAEOkSWVVM84Nl+6NFkchutyQ4oCzifbkDEHscekHj4atq0vHOQPHcRz2kV4N4ntQdNormHUUHBgjtZh/Ia9FXEmV6HSlm/XVWk0CWWcupaqNX9SC6biE1F5e7F8TwCibPzzKi4oS+4fx87GQoI69PSrEZovfVE9YTCs1K3On5ttUgzcvifFnjNqtFjO55KYSLg2ngtGMdonEOiQgKNVnn/5GhDxJ1H6q3ZEZdlHh3tjkx+O/1nRpIyfcTfxlLa5xdyVxZ/tppS6bX2iQUR3VYI6J9LTr</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIC2DCCAcCgAwIBAgIQdQDEP+8zH75CmI+0PbZyxTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBmcy52ZW1lbmRvLm5ldDAeFw0xNzExMjUwMDExMTdaFw00NzExMTgwMDExMTdaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGZzLnZlbWVuZG8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3AhdaaXA8ukj+ayfPVfFx+QGoFG9QDnFger3lNtvVqHXUsqiDBfI/SEvr04sC/OBMvsWjcBwOw/c5P/nEEkTavXYc/0PLd1lGYv+zwEKhBxKo1egHeExqDsh1Ci2DQux7gS9X514REO5XaTf8JvRKVKkpE+Y8ASsrZSp+YGJ63A36bicfKx++6fD2e6MfllPeevNoDWxCX75QPVKgQDW/tT5C9fGd/sA7aNDGMXf39x2LZmdeP0sYiQN0HkeflQlu8CYR6n0Ua5WyKpaax4TXYCPg9snDb0ICFJXnF2SWzwrjy96qQDK9HEPOB2uaB2q/Z3F6hY06wrPSP/XsmkBcQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmz18QNZQwi8pVMrGuiujj6iau0pPbc16hg1mT7gTQ6n+PHmydmsYWUxvu16zz9bDFMrrkNUmbJO+o+FcFUKlLQKrZ2znjuKol64sfLlJgliCpRxRDj/ovVlR0zY1YgLu53IKmqzd0H7ZXneWPQpY5qopa9DtnsG5xSG04W9rbN0lMf4LNlOMiAJfGc46KZhrWOEB9O/v02Y+nGTuSiIuhvyOGDJ17r/+DvKZlovIrLKo+E6CN8PTsBOyebi4MogEaUbPRsARy1ts1wTipZD8lm8rK0MK01TC2U+tMb9dEsSLIBObJdLz8Hx+20JAj9r+Ue6RYt1zrNaGhuEG8OVkm</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.vemendo.net/adfs/ls/"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.vemendo.net/adfs/ls/" index="0" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.vemendo.net/adfs/ls/" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/" index="2"/>
+ </SPSSODescriptor>
+ <ContactPerson contactType="support">
+ <GivenName>Jan</GivenName>
+ <SurName>Aldoson</SurName>
+ <EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
+ <TelephoneNumber>+46462220467</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Jan</GivenName>
+ <SurName>Aldoson</SurName>
+ <EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
+ <TelephoneNumber>+46462220467</TelephoneNumber>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
new file mode 100644
index 00000000..880e6011
--- /dev/null
+++ b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:remd="http://refeds.org/metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="https://idp-test.comanage.sunet.se/Saml2SP/sp">
+ <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Sunets COmanage IDP (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">COmanage IDP (test) hos Sunet</mdui:Description>
+ <mdui:Description xml:lang="en">COmanage IDP (test) at Sunet</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIEOjCCAqKgAwIBAgIJANaoiJzHBBqYMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDgxMTQ5MzdaFw0yOTAy
+MDUxMTQ5MzdaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKygOLTdW4j7P0VslStMbK0LmD7N
+k7X6ewembu63FjcAJdko5db7ekXIBXcQbZNwSqtUavsbr0ztW5nIH+YUcl99tRTZ
+/KGSeXDe7YyERIZq6BGBi7sF00+isZYQl19SVvdfMzUiC6vebeJ3NveX4Kfj5pR6
+8iOeQukhtkR3LFR1gomp0gFWonssfPADyp3lru4UXeBF83XEfdafmxSjR16zAzHW
+KgspLjOr8uSnFD9ZjFQrqxSUA8TsqIvbM3qqXICA8UGSt0pe/i7peVcS6DRbCupU
+r1+IsSGCLxOsUmQaDQiOZp8YtZRrcljVmmevQlu7oHX6hcnK+1cyEa3nWZ+R5MQO
+nVlc+jiDlt3Ucff1auNIFI4KoWvkheVqWTdloHL2BerBPe2dduooKMZKQHPLJPb1
+dyF6kGzpxUPkklNLjU6q/SCPPa0rI+NLa16fiIeI04d7Bn2OS+6n+8obObMZwanH
+eJLuSuIe04t/bAAY4KB5UsRFLtMMd2PUInGe2wIDAQABo3cwdTBUBgNVHREETTBL
+ghppZHAtdGVzdC5jb21hbmFnZS5zdW5ldC5zZYYtaHR0cHM6Ly9pZHAtdGVzdC5j
+b21hbmFnZS5zdW5ldC5zZS9TYW1sMlNQL3NwMB0GA1UdDgQWBBRAYoG0imNLzoHO
+zDH4Caxi4XYUZzANBgkqhkiG9w0BAQsFAAOCAYEAWdnGljPC1PQbRDHdulMC1/zt
+s5ZhHgTlfe5PMydAAeLDl1p1qILh0GL4BVIrL4PBa1ROjvRHXl2rDXShlW8TRYMx
+YsfvEqbLMnyLhT6dlBUS1MPgquSIzF6wo0tDBF3X97KLtC0j2mKhvD4wezG6qhUX
+/jhoxnacuszrorgsFmARLaemx8ndqCiFJjaP+o25etG3Gfg4e4gsWVUMl12M1dMq
+y5R4oNX3ov64xc+/akXE/xZz1vOEVzaMxLBOpMHSb+zUoHk67elRP7cOKzY5wnhX
+kq/QJf//0bnCPsUVO0yGupFzwB3qHbaK7BG3JtWW1BBTKh4OvI7dRV6ivgmmWEg0
+BNC6JBhMIppOew+KNLzsPNzB5242LBdZd6v0IIR/swP8oi5qFTAe2jwpxAi8QxwE
+v1H4Us0UOyaQ0lqJz6Qz+JxzbZO90KN6TK1YLfs79zhoK1jJt73EOC8iK48dVgY8
+ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SUNET</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Technical</GivenName>
+ <EmailAddress>mailto:noc@sunet.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:noc@sunet.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index 7e3868bc..6a4ab97c 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -5,6 +5,7 @@
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+ <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
</saml:Attribute>
</attr:EntityAttributes>
</Extensions>
@@ -37,13 +38,6 @@
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIH8zCCBtugAwIBAgIQDaNbpG1dZnWHBOxGpbv0rTANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHlRFUkVOQSBTU0wgSGlnaCBBc3N1cmFuY2UgQ0EgMzAeFw0xNzAxMTcwMDAwMDBaFw0xOTAxMjIxMjAwMDBaMIIBCDEdMBsGA1UEDwwUUHJpdmF0ZSBPcmdhbml6YXRpb24xEzARBgsrBgEEAYI3PAIBAxMCU0UxFDASBgNVBAUTCzU1NjQ3OS01NTk4MRowGAYDVQQJExFDaGFsbWVyc3BsYXRzZW4gNDESMBAGA1UEERMJU0UtNDEyIDk2MQswCQYDVQQGEwJTRTEaMBgGA1UECAwRVsOkc3RyYSBHw7Z0YWxhbmQxEjAQBgNVBAcMCUfDtnRlYm9yZzEnMCUGA1UECgweQ2hhbG1lcnMgVGVrbmlza2EgSMO2Z3Nrb2xhIEFCMQwwCgYDVQQLEwNJVEExGDAWBgNVBAMTD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFvAWT7LPS4Gl0ywiMIHcPGzNFqgqtg1NveV5iPnHgTlh+T72kcQ099F2ueXIP0mC5r6Eguy8Hv4sTHajnLPmaRFWgs8VXbIRI+8UdmAeWomJAZbkS9iUbsToii+ShKGrvOoIenCagRbmjp+Sjz571sOZ8D/LQCWguvyQgeXToZXUD63OGsqu/FdOdWQUKcxxu2fAbqpJmdzetQmNVfdXPBulhGvhIDYU/3y2E+wUH45+4TQAYMOvcAuQpdVcuQf35G1IHRVbfnwbiDmIKAbkgAJKyETtNYzzkKEO7Mk7BVrlN8Hr7ny37Y+j6AVYm4SXgwJwOfbfuyZupGoqr1xGkCAwEAAaOCA+owggPmMB8GA1UdIwQYMBaAFMK4hdfhuRO90Ui8/V7cfZBCeoqpMB0GA1UdDgQWBBS6y7/8EjtLFGwWYPrfbZOSIHUdsjAaBgNVHREEEzARgg9pZHAuY2hhbG1lcnMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTEhpZ2hBc3N1cmFuY2VDQTMuY3JsMDygOqA4hjZodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMSGlnaEFzc3VyYW5jZUNBMy5jcmwwSwYDVR0gBEQwQjA3BglghkgBhv1sAgEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAHBgVngQwBATB7BggrBgEFBQcBAQRvMG0wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBFBggrBgEFBQcwAoY5aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTEhpZ2hBc3N1cmFuY2VDQTMuY3J0MAwGA1UdEwEB/wQCMAAwggH3BgorBgEEAdZ5AgQCBIIB5wSCAeMB4QB3AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABWaxG10EAAAQDAEgwRgIhAJ8aHnkMZUnmS8b14TxpxJ6bF0D+FyupZHydymr6eiUUAiEAxuc4R2xGwsTpTyiGrzjOhpFp1m8OxCXm6yy8DYnk8K8AdgBWFAaaL9fC7NP14b1Esj7HRna5vJkRXMDvlJhV1onQ3QAAAVmsRtgtAAAEAwBHMEUCIFKcHShfX2Vx0U6nMdOybcllepBjF/LBXosy+tF7uJ0gAiEAiKWCgJ8xNHsiPrnOjsSbgK/em6CxvJpTm7izwgd5jIwAdwDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAVmsRto2AAAEAwBIMEYCIQDgfq25uMuMnrenJ51ZO7iod0XsZtmlYPAXkVMga4xdSQIhAIQmrpUzpznhNfawdvezpjQWlDF8G18HFD0woxX11Do2AHUAu9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YUAAAFZrEbX8gAABAMARjBEAiAM8ZPi1tdEYR0RyY8lmlacibWB/jNVvhx6Xk3C+UNqVgIgDNDJu1z9oSB0H3Kn06flyp8sM7/2MbFpYItnoRLgJYgwDQYJKoZIhvcNAQELBQADggEBAE9MAeAKr+x0//3fQrt9lbyrJzEfISNp4g85PGGwVoBZL1LBDAMqLhtpnzVxpXBjQ51w94F2EM/dZVTQRnOjMby13diSqiui8FhGapmVJ6QR+Asw8r2JLQPpwE/isyaSy2JE4nBDZI8zf4uGxYGMu9/TACsGwnz9TO8pWsFgq9K7OgH+zibB3vGjTqZGy6nETbQcuHyZry6RDQM4edU5GNAVWDebpgWlRGfp648tPOaaku10gWwv3eWjOIEF/3SjGJ4/QvoQZD+bTc6kKPIdvI9wr3Hmn4rFA+kR8p3Pq6vwaiZmdEV2v+iKJG0QArS/ZIhQ3ogLOxWoYHNMu/G4K9I=</X509Certificate>
- </X509Data>
- </KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
- <X509Data>
<X509Certificate>
MIIHLTCCBhWgAwIBAgIQBIXZmWxxZfiObkpkD7lZzjANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHlRFUkVOQSBTU0wgSGlnaCBBc3N1cmFuY2UgQ0EgMzAeFw0xOTAxMTAwMDAwMDBaFw0yMTAxMTQxMjAwMDBaMIG8MR0wGwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjETMBEGCysGAQQBgjc8AgEDEwJTRTEUMBIGA1UEBRMLNTU2NDc5LTU1OTgxCzAJBgNVBAYTAlNFMRIwEAYDVQQHDAlHw7Z0ZWJvcmcxJzAlBgNVBAoMHkNoYWxtZXJzIFRla25pc2thIEjDtmdza29sYSBBQjEMMAoGA1UECxMDSVRBMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnSrJlUe0DFyWDxK+KfouYDpc8JMjTi7LyyycUdXwaTTir+DxxMGJNtUYSUPX6aLmirSlhn4V3HZxSVEeqGStKAqT0di5usYuVzm7o1eo3tFqm+FNepMnT/r6KHhG/XK+dpDhRYS8mQnpqDllR/znG21qyyKUZgX9hA3A+awS8OTSJv0xium1Tn/xItftIt4QRYDTSUmKMwwpp1WDU7PcBizE/mtIuMdjF8BBFFFALkIi8ovbsXCw7lqfXKoT5VXcgQa8ji5T8JNueAvxLvHJ30wZhTxZtpA2dNvHIvcx/IQlRvE7mkQS4xmKNIBlYEA9B4nZSN6DL0bNrUzauNbUzAgMBAAGjggNxMIIDbTAfBgNVHSMEGDAWgBTCuIXX4bkTvdFIvP1e3H2QQnqKqTAdBgNVHQ4EFgQUel1k+Z6iH6VJXpikroaMhFwZoYowGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgYUGA1UdHwR+MHwwPKA6oDiGNmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xIaWdoQXNzdXJhbmNlQ0EzLmNybDA8oDqgOIY2aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTEhpZ2hBc3N1cmFuY2VDQTMuY3JsMEsGA1UdIAREMEIwNwYJYIZIAYb9bAIBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwBwYFZ4EMAQEwewYIKwYBBQUHAQEEbzBtMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xIaWdoQXNzdXJhbmNlQ0EzLmNydDAMBgNVHRMBAf8EAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdgDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWg3fZVLAAAEAwBHMEUCIQDdaIcXjcX2ALqizyqxWO4/Co/W6l0KtOFHIo1HvWebHQIgRDgaPQ26d0CZu8fogiM8kdo76DsVVlRHrD0r4Tirp5EAdgBWFAaaL9fC7NP14b1Esj7HRna5vJkRXMDvlJhV1onQ3QAAAWg3fZWJAAAEAwBHMEUCIQDDY0DN31LHG/fQHF6NU4R61UvFSRxeWa3cic3CSEbLkwIgOJqa/Z9Itmfyk9Brtt16zvvwLfSomub1iemmF6HGbMwAdgCHdb/nWXz4jEOZX73zbv9WjUdWNv9KtWDBtOr/XqCDDwAAAWg3fZcHAAAEAwBHMEUCIQDMK/EAxpRvb2Jurlkt2b1myhXwtfhSU49DQcJ8WQXCIgIgdsMCH3H+knJAXe2Z3u9qT9hwKKZoAhQKIVy20zGvtfkwDQYJKoZIhvcNAQELBQADggEBAFBs66A8Z9yOnVMjqDjHwCi8j65tXhaUIQ26X9uqvyR+ju14H9EI6mWEyLxnUqBesSveScfzb7UXCQ8wcVJfwcIoUEo/8If9mYUxs4FjABvyCFnNihO21pJaiZ+iT8FY/B4l4PV6CzB3PQ6+AbNB1ua8jc8noWsiuPtqBpwnGCj4P2GgNd1LYCW0Lx+5dNsC3NHYzwI0Sxq32zAn7i7H6Jh2I92QHyav96nbaohk3CFW6lyxrZ8UYMUbpv1xq9Z/chNMy2D7a4PPYW4LBxl8WA3uJSfUYenVKKBZsgEnxO5L8xBxravNSvQ1XGPAnYOYJ7lBM38Xq8wiPigePCWKaX4=
</X509Certificate>
@@ -80,4 +74,9 @@
<EmailAddress>mailto:support@chalmers.se</EmailAddress>
<TelephoneNumber>+46 31 772 6000</TelephoneNumber>
</ContactPerson>
+ <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <GivenName>Chalmers Incident Response Team</GivenName>
+ <EmailAddress>mailto:abuse@chalmers.se</EmailAddress>
+ <TelephoneNumber>+46 31 772 8450</TelephoneNumber>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
index 77bc4520..f2684af7 100644
--- a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -5,6 +5,8 @@
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
<saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
</saml:Attribute>
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
diff --git a/swamid-2.0/int.mp.uu.se-shibboleth.sso.xml b/swamid-2.0/int.mp.uu.se-shibboleth.sso.xml
deleted file mode 100644
index 06af9d34..00000000
--- a/swamid-2.0/int.mp.uu.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://int.mp.uu.se/Shibboleth.sso">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Medarbetarportalen Uppsala universitet (test)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Medarbetarportalen Uppsala universitet (test)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Tjänsten Medarbetarportalen är en portal för anställda vid Uppsala universitet och används som ett "paraply" för andra tjänster vid universitetet samt för publicering av information som rör anställda.</mdui:Description>
- <mdui:Description xml:lang="en">Medarbetarportalen is a portal for all employees at Uppsala University and is used as an ‘umbrella’ for other services at the university, as well as for pieces of information relevant to all employees.</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIC6zCCAdOgAwIBAgIJAJIGt0tL4NyiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGludC5tcC51dS5zZTAeFw0xMzEwMTcwODU0MThaFw0yMzEwMTUwODU0MTha
-MBcxFTATBgNVBAMTDGludC5tcC51dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAO0AQQzDf857OeNE5/0oB+xcNKEO9+vEr2PH8jONqcZqtMmzdmpz
-vv2+ti/nezoE1RD8g5LKiHcRQMAZyzlXt4ydxAIK2jGumVNIM0lrinqhIEqZX/9p
-suIN6Qvc9MZVEgpojPI5Vq20CQB8vF6E9d95739mFPSGwW/ENhy0E9wg9pEXfZmg
-kMHUDiPkc+QipVvqgnNq1/89q3SYqqdAojHEp7QGFjdIcia3/AhQKWRmnjyxQqTS
-Xaew7L1DqXZLfHveKrmr25v5hu37s/nWhme7y7OCeMpQTtR7F/kE4KLmv80ABpC3
-mrwAfehuOKDV/HKeqHc/qOt2PAjAlNDe49kCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aW50Lm1wLnV1LnNlMB0GA1UdDgQWBBQeedkcB7UXabpD2Qn+kJavhqiTvDANBgkq
-hkiG9w0BAQUFAAOCAQEAAb6QxbcqzcLatN9XfNDWpX4ZNBO71BMdDsUVXqOlARlf
-+cFIn+symaCrJmosEt/q0yMSthrLmtWwysG9o7kYQuLKb0VXGmF+11ITls4CejW3
-DxSWZteV/2rp466eFigR6NdgaDwV3ZS+67FI3644r7y6wHfzWQoQ1ePthcuVU7dH
-fvsw4wpoIe7vJU1tZ23Y9N7RCzeV/eyXln0MI2EhtD69HwsGFt5vuzKVGrSMj2g7
-2rDQ0Eh7P4RNMj2QQlr2HDdhhjr705AlzTA+Jx2SkxhZY1AXDNkdtUJACadKw82X
-QGjKPpU/Hgt9mI7GUPx4BIyh2nfFWWC72b5hzEfT2g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://int.mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://int.mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://int.mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kau.instructure.com-saml2.xml b/swamid-2.0/kau.instructure.com-saml2.xml
new file mode 100644
index 00000000..bd6192a4
--- /dev/null
+++ b/swamid-2.0/kau.instructure.com-saml2.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="http://kau.instructure.com/saml2">
+ <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <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">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Canvas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Canvas</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Canvas är Karlstads universitets lärplattform</mdui:Description>
+ <mdui:Description xml:lang="en">Canvas is the virtual learning environment at Karlstad University</mdui:Description>
+ <mdui:Logo height="46" width="192" xml:lang="sv">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
+ <mdui:Logo height="46" width="192" xml:lang="en">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <dsig:KeyInfo>
+ <dsig:X509Data>
+ <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
+GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
+IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
+FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
+MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
+YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
+CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
+IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
+xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
+JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
+PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
+pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
+GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
+A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
+DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
+mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
+BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
+XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
+1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
+Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
+SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
+ </dsig:X509Data>
+ </dsig:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+ <xenc:KeySize>128</xenc:KeySize>
+ </md:EncryptionMethod>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <dsig:KeyInfo>
+ <dsig:X509Data>
+ <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
+GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
+IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
+FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
+MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
+YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
+CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
+IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
+xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
+JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
+PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
+pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
+GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
+A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
+DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
+mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
+BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
+XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
+1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
+Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
+SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
+ </dsig:X509Data>
+ </dsig:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Location="https://kau.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
+ <md:AssertionConsumerService Location="https://kau.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
+ <md:AssertionConsumerService Location="https://kau.staging.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="false"/>
+ <md:AssertionConsumerService Location="https://kau.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/>
+ <md:AssertionConsumerService Location="https://kau.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Administrator</md:SurName>
+ <md:EmailAddress>mailto:info@instructure.com</md:EmailAddress>
+ </md:ContactPerson>
+</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
new file mode 100644
index 00000000..6a730733
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -0,0 +1,57 @@
+<?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>
+ <init: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-00.its.umu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3‑demo‑00</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3‑demo‑00</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
+ <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
+ <mdui:Logo height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-00.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-00.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-00.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAJ+VUV8Zduz4MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTAwLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODA4WhcN
+MjIxMjA1MDcyODA4WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMC5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq6ABs5OFGxvp+JVn
+h0y5cKcqJd/pBy6wrBZHkveIOjOrD7cg1o4TorIFcjdQ+wNG1vS5sEZk8b4Um9dO
+mtHb2N1WiEpg4W/dve1q+YoZllQjSEV/ouNIzmTVvY84O8zIArbM484smVjo9a4p
+2Wc8goAIpuQF2ZtWix4UZHkJrhJrdFTU67e3Cl9QJFWGc0fCi+Cz5r++AtgtOAPN
+oagiwdnJI319moULBrhisCrL1OWnKTiP2+D2CT8iMgoVAptpeEYJuFlL913LyomQ
+dWnaCvWp0FmERuVBPrShl0EZ5+i+jjsp5UdKg1cwYkS0b35GVuDMmS6pzK6HlAL2
+PC/1NQIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMC5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAwLml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBTwikg2zQJCzo6yrFjx2EIhLB6UqzANBgkqhkiG9w0BAQUFAAOCAQEA
+eNZzk8uZ4PJJks11q9WW1PTlyQmmRO6zfDVuJ38TQF5G8owkn5n1pefgCZXY1Pex
+0jz9rbs+cR0aWkdCQA6prFYAK8NT8k9190srrmOAk1p+uL4SbJJW6gxSUuwCJYVs
+R9ohpgwvJCvFqYo+fWMMFoW5eQzMsOZ79oExlx9fMAeJuVuuLkWkf4YABhIgxPTi
+BFoCX3hSHGjRDBVjJ+snuOagE3RpDs7bcHCbSVHvw6KDZbdLsY8qz6birOY9qQbk
+EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
+5b8F1Nc7l9VE8yY3BhUT1Q==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <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-00.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..65fbfdda
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-00.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-00.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-00.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-00.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJALY80u1Q5yYDMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2xhZG9rMy1kZW1vLTAwLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2MjVa
+Fw0yNDEwMDQxNDQ2MjVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAwLmxhZG9r
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMf+5VWM1++P
+Z37tYP+8v0JoV87NCIaz1f5Z3ZYObi5YFX5PVCCzy8+RjsZJ+Z4MJWVKosnaM6EB
+pWsrPJHZSlJeiZK+lzmRFTEP7MhPHHk/CDdEI5LvMxYFk1Py57tRfjtc+nJ6hlGv
+cyJLYoDqeqmO6sb7hLAivOcCV12K3Fic8pPGdhRROHejzGPXFUmjdK98/RXksH0l
+9s9j1fHN29hix/CoOlS1B5efv9eX7aHO1c82qMJYWIfVUQHSHP6ii0nBlHHvh+Jm
+QtVn+3XhwmL/aOj9dVFqcmshGOpQ3CTxov1FgalbRGcJ7Dt84d4XfkdPaN8/2UHO
+Arp456IX5jMCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMC5s
+YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDAubGFkb2sudW11LnNl
+L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFOUa/UFpjSk/gRQ3pRJmUtkB
+VdniMA0GCSqGSIb3DQEBBQUAA4IBAQDFdLt9wrrsSholwlAfFojbp5CRp6WPv5D3
+IdA0p1be43iNSDEORSIHrAEUuxgDJOvZLpDefQg5ZtmT+S3sxeO+KvUM0IHe78qE
+swfB9bvvQ6Ev331Sj/HVuOIGmIhcjxKA4B+FWTxvGxD7Loxeaoe0hKnlG2jJuFbt
+gu1TH91sschYabmEnRKqYl9M5UxssEtLL9X96h7k51FtEcT6U9jRR/4XvfbwvNE+
+AXW3m6StkVo5baFuUDWPAQ41e+EKBHmt6N8ONNl3DfoC2/owNiiGfmkuXFyOsJ7i
+xWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se:446/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:446/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
new file mode 100644
index 00000000..b26df7bc
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-01.its.umu.se/gui-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/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3‑demo‑01</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3‑demo‑01</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
+ <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
+ <mdui:Logo height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-01.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-01.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-01.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOeH1y234BADMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTAxLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODExWhcN
+MjIxMjA1MDcyODExWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMS5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5w0tDtWTb1i7oEXr
+cmgSbQN2+INDlywnQRJXaGDyjypZ66LtKafw0E2g7WXCfYupkGGIf9UhpYY2tbMh
+d0yztJiKtvWTbEb8E8Z7D1kG5FuoXQkjmG2w/FKzSAFH0MLiGyfvr9oBab3F7yZQ
+zZ7t9XPc1RFe2qAYmu3iH383RmRb9fje/WXQVk4cMybqhCZTUoiHBWo9dZhwdxfL
+/UeN8BqIY+NwcmcaIdyPQKH2NGB5/3bJr0doap127tyokoyfLDo8meJnBc4zwSt4
+XCLFmC4g/1JsIe6T2RsieYtpVY0teWB+LH0emFTlyuhoNMM1bTtVfUk4mjq/R1B8
+mjxKhwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMS5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAxLml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBQgFTqtvplztjIK/Tf1iTAdLHAEwzANBgkqhkiG9w0BAQUFAAOCAQEA
+OecNgHiP0PD31hbHg8QxsL6IHqpOIrvXRyj+U9gnG/S1ivj79y+lyO6HLrqsycOJ
+UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
+3wpgakdItEHPLbvx/v0x2aLvEgf7FrV9cYrv0HpVI+rZrETTDxWulmS1WE3jr4mm
++Xbwm5CdJMFxtdHoADDUxbYpb7HMu8XLPN0/nVKEs/87xGCVQbHO8uRNQmeDAQhn
+0ev1AvjK9iWoPASSWa05+hcK6gULU5zjl0B4zuECMj9Q5k4Y/0rEcKN828D+JXHq
+9eyXLV8+BdsY6n7mcEsoOg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <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-01.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..a9ef01d3
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-01.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-01.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-01.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-01.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAMRYGhBhn5UuMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2xhZG9rMy1kZW1vLTAxLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2MzVa
+Fw0yNDEwMDQxNDQ2MzVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAxLmxhZG9r
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOalh/0b61hE
+OCTOh82ytTf3633I9ZrsKD1XGlCICIYNbgrqRwA/T2NqX6cnQh2hgTqlUUaVX7WZ
+q3VDCmi84v3RRoDC5mrP84vWejNzVMZKCwugp0KhnDQbWb1qzQnGTI5ezgjuXmIr
+qPlBPC0AaLTb+6jX9VRA+rJqiHuJATF+5fm1xwiJ5QR67DiVeHewcGP3r9Z3Fb5g
+KSmbd0GmkXZb4F10pmFGE7471ZTgcrL9soAaA8hlc2+jL1UVvtE7PY9VTcnD540Y
+koL9kIfnMWIO/x06fWJQkphfrQu41Rh4UMt9e5qcJcUA/knmw/OWPH2/svDhv0mO
+rip3BLBPe+MCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMS5s
+YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDEubGFkb2sudW11LnNl
+L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFLboAtPLn/yoa6dvPyfFZXlD
+PY9vMA0GCSqGSIb3DQEBBQUAA4IBAQBWwcRdfbwtKbNYHuI2mLxjoh2Zac/ns7BR
+uY/ZmbDJ/Yhk6vdiU0/jwP2TkIs0Z9/oXetVuQICtgRLdBBSBSNpUMsMqR+tJ6Ab
+etzXToph/gvyv8XNjahPtOOLvtK/874r5JuqfktFcsTjhxoxvEsRq+H6xUnitw77
+Iq/yhze6jvJn+5zRr/vkwpKJBLobXjytbvaahijlJxKgj+FBEkwUTotNnz5G4SsA
+pYOMqd8nZEwrLoOlQXb5MKRDS0cdjiDGh7RDvQgs05MTMHQI/C7pwoAm8XWEfZlP
+doapb4k+1TzJZ+MDX6jwvVMl0DN5+rmuHjkmu75L+UERnVJRSbIK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-01.its.umu.se:446/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:446/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
new file mode 100644
index 00000000..ca9bb4c0
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
@@ -0,0 +1,57 @@
+<?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"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3‑demo‑02</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3‑demo‑02</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
+ <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
+ <mdui:Logo height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-02.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-02.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-02.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAInGoLqyk3C+MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODEyWhcN
+MjIxMjA1MDcyODEyWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMi5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+xisO1AornoaWz46
+IAUSjOCPXp4NV3cGU01VsvXe7FhZGByScd01L53WkhvWWLCGKTxZNAS2dyAbDhEO
+5X9TMPtpHE9XCcyqd8yii3g7nScj5/S/YudZOnZvuCDlH2hg2YhCGZRujUA0e7JM
+otEm/Lz18AecsECQsbNd/95oYl6/k4TMPg8dT32rbHQl6hGPfH+IK1Z7OMnXYsP+
+sMBgaSMfQna8zaijQo0aM9/zyp3wxeTsncS5l74eYm3whaKHxRsTjvUh/YaI9LTU
+wrPxuwZINtQ7HiZ/3KwoREl22zsntUemTmdWez85ctYMdtEc5h+3UVNfd1P7UNcW
+c+oZzQIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMi5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBRahNxHA0sPHkTEvPxjZ+V6K2tTQTANBgkqhkiG9w0BAQUFAAOCAQEA
+tUgKur8E4TfES+5QbUJpKABDRJUiPmxrlUAaU+B2BZA74+tO717esA44Jahlre/v
+CV5grAoeplD6llBeMUe7hVsMum63kUpUh+zLwiP/KSegjxrYMv9vueqpCB2bYzy4
+4Kv9GchQaA+XvdX7pBhQdQchEmexlkoyLk52pIG5kPos5FoKUnE1avcydLDn5IXF
+FtfOLxpCpBkLZT1JtloPydKvbueD28Kpq/BynPMijzH/Y5mTpy81h5MY+HoOWmus
+zhFBTc7cydJB7Uvj9A5mgA9DtxsnmBxwRv/VwpXGmXGTm/Lrh4o61MI/yI84/UEa
+a/lggwDHd7eCy/34Rs5nJw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <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-02.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..b21d136b
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-02.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-02.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-02.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-02.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAMVbo/yQV7JWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UwHhcNMTQxMDEwMDkzNTI0WhcN
+MjQxMDA3MDkzNTI0WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMi5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Nuc1eTRGUFZON4w
+X3uokaEyJUcjGB82f9XWIUcraOVREAhLUQm/FPkOQQO2+WslwAe0otbqMTLFVKL0
+XdI+O0rqp2sgX3YdIepLUz03Lh/jbWFqm3ZWnIrNozaTNdedVlqMaQZHNDq8aHYx
+d6AgV+js4lIjbZUY3NHHISwE6ghxMtfg/0Ok6U0/KN6YbUpALV0hoGTYVIep2Y4/
+QPL8oPYLf2n4x2yLh9+c0GQ/OIPzcrZv0q5Ik18UkVQs7Ki4DOtjkPRm3/tthnQk
+nnwla9UMnDeceYECTj6qMSflhaVWpVLbGOS3Jp4fQOEo7DPwERjEOq4Uf6RgIySn
+pcMNCQIDAQABo34wfDBbBgNVHREEVDBSghlsYWRvazMtZGVtby0wMi5pdHMudW11
+LnNlhjVodHRwczovL2xhZG9rMy1kZW1vLTAyLml0cy51bXUuc2Uvc3R1ZGVudC1m
+cm9udGVuZC1zcDAdBgNVHQ4EFgQUbOXVTx2U4lRY/yJvTr77t5M06I4wDQYJKoZI
+hvcNAQEFBQADggEBAKycVqpsgiW3IwW4DvBieorz3sa3qsgVckznLuUbZIXXpEHu
+JhFXdDYxxQwFfJThbTf57g6FxkLi2RYi5Cd3ZSZlK0/oGEnJ6yFcJ0Ip8TcJEEuL
+A9io/dCrUcOt7PBv4tlx32u0pdpPaNpQPYni4viv4FRJJnyM9ftsm2j8Bdj5GgUL
+nEutH0uEcWAlsF0OwRz2eRMJwe0Y2fnFnu7uGEOlXrpwGChin8UiuXt3cRLUJjR+
+/B8xPec4+f1VkwfZpnonDIv7B8ukpCIwv92sdYhFdrcMiA8ubD+nicffPhE7KDSE
+sfAksU5zX5TLN6UmXQeW0u0pLpk4YCOXJJ5mX6E=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-02.its.umu.se:446/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:446/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
new file mode 100644
index 00000000..c6ca3486
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-03.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-03.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-03.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-03.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-03.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJALoCuTss2H9SMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTAzLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODE1WhcN
+MjIxMjA1MDcyODE1WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMy5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtCWTsROjG4XTb5Z5
+RDv/5jMUg9K8Lrl/oKA5WR8qCkoWHPBh6ZguiDW5EBU30McD5+5VrKNcnJpAC9r6
+DMxj/ItY1ygy49NDAtzF8cgwcUfgAaGDPOLIyVO3wZ7A3sAlA2ZQ7XFF5hM0sJCR
+CDo5mIt79/Sp0C3uXSSeYPZpD+XBByYez5D1g5wiCxGlEt8K0LOoQnUlLXSnfeWw
+LSs011SKWTmxrvMxRbipzJ4jDRrt/iwF/7BBix9ttmfzWDJo3f/lohpKZeqOG6BY
+azQm5LdzsZ1pMIi6h3wOQOW7jHB89CuT9ghEXAsXtkd8A0dPBqI06IAGL/baxXWV
+LVY+fwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMy5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAzLml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBREcC+pdvDX2684yykTCO0bBqgRjTANBgkqhkiG9w0BAQUFAAOCAQEA
+K9xpSHq1DVE2OIAxget0qluLRUGLdcUXz+cm+tMh1DDkjyKt6Xqs6ipNEU5tcsiy
+H48lFPUtsXj684qvU0KUOY4mKztr2pe9+uekunzufdAu+jqMP8iHuPurDbMCP6uf
+nzdTzILt8TweefP7sReQpKniOeagBUqev7Xr46NT4PB1UlRIVqsaSS9mu2oWw1R1
+XsE0AissQN4ZaXbFQwUqhFo8E5U+Z+ISAdl4h3mdMpKCym62Z+sQSlwap/u6Gw+q
+9qSmvbirIZaGQlmFi/1QDZtF6PnKti/Jrtm4XQyYyi60fXtei96duahx7LLMMOtw
+b/vkajQh9nHWAfPhgIOgkQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <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-03.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..ee86fef1
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-03.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-03.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-03.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-03.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAOgVT0mSkmI0MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2xhZG9rMy1kZW1vLTAzLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2NTVa
+Fw0yNDEwMDQxNDQ2NTVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAzLmxhZG9r
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrCNs3pcU6i
+s/gLwcSclyG1xVnkFeFWD6rsmV6dHCFPq5u19YWTEGl/X3WmyZqSAb0ejPMxpy8V
+PJCoY8C+OkFmdwQurOoKfbdbnxjUaKeeP2WzffnpvfuL0LuvtMd1UdRnfNlRQ9el
+68NoY7YWlEJu4B1w1WPY5KhEc48yWdNj8AgcklbjP/TKycKDe+1g4GAp+WU+Gcxd
+681GUeAWWXKIqUVJBLCREETpytRTRMKUdE9VV1CPrl4PdGrndSxOAHgfy18KO/mr
+psivMsJfat8giGmr6ybNBjDxx7jMndqahaK+/o6n5xxAI07Kx9QGcdXmewX0cE4n
+Oxf9oyixteMCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMy5s
+YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDMubGFkb2sudW11LnNl
+L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFMz0MnV1lmCpi0zSus3h+Hqr
+rk+SMA0GCSqGSIb3DQEBBQUAA4IBAQA4EwmVC3KoTVliA3AZcCE1lJpyL/qGi+zr
+5YnPebi4Sf+hTxUS6diFGT2Eh0FSvN6omQ2Zryu0CALKXb6t1ieV+dymNy/3+T6I
+75fmCt2Mcju+YdQPiy2glRnTVsy+NL3s5RfujOK2Y/6JkC1T1bhkY8q37vXy9l0m
+VCquud3+5bD/wfYkSrbL4HjwliXohlAGXy5BtfNK6wg6bHSTuHO/T+yjAAF15kFn
+rTIw0vdVAMr/ssruViMKF91ztRL1ABMxhvn2OqUPW3kE7pJDw5+lDjH6NDeYcph1
+9sW2iFgVmATh19bE+JPlWOV7LHo5tDD0wnoy6hUKxXyEa09wUUlh
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-03.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-03.its.umu.se:446/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:446/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
new file mode 100644
index 00000000..e279e1e7
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-04.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-04.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-04.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-04.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-04.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANlFzsY2FA6AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA0Lml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODE4WhcN
+MjIxMjA1MDcyODE4WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wNC5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvlVP4OWFWzxFY0/I
+t4PYP1o9FZ445Ny8LR7lvQA6Po9V18dwgd6gcyaN566m+vRbmSph478N5aVqjypk
+83dOD+oGBvFaRz4BpHZIcvxRQReR8QKl7jFmTuDbd/wLp1kaMpirwkaxL6RhO3e5
+cE02mey1QqluMAyH43WSOUMDT6QFwVbl5NPn2otduFdQYJQFX5Lyxs23ds11l2RU
+n9lnBOFhd2Q+gLffoXM1oS1eb5/LbZ0axsau+cURyHlmklnt4mvx+Ab93tIGQGVh
+PnGK8oEVVmdqt8rbmvrb2MEASIDAmQ+l5yE45o9NoikcvCzI8Y7zvbvUWMo2d2d7
+1sigzwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wNC5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTA0Lml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBQ3gGPs2hRPUPD9E7Gak6TZdV1t3TANBgkqhkiG9w0BAQUFAAOCAQEA
+CxCGvf3tc5IFIffk9SumXZEVZWx5anaH3cJt7cQ4BXLxVGEIsM0j+CC/o4nnFFd0
+KjtU8MN9dIip5mI95QFVY8EcGKoVfu83ZRou6rqo//z34sg6c5ybvI85LDj4Kqem
+0TVxhloov+Bgjj+TCXKDk04cIMmgXbRoLyqn3RcBYhjyEPcK14QTHLPf9dk7mx5x
+//bToL69WMAfERaGj0/394W0pMWL4WhmvV+3DeC8sLjlHNqRrPfSl1jn5FgYMOcd
+yvyUqYJ7h2Q0KgjSQw+DteUNpYqTfQtUYQgCc13+BbVnfUW6Rw6AsFawtbEKTLpa
+P6m+IbDWFLo61vhr/Nkcmw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <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-04.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..d99b2f01
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-04.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-04.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-04.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-04.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAPHLrm544TrtMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2xhZG9rMy1kZW1vLTA0LmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ3MDVa
+Fw0yNDEwMDQxNDQ3MDVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTA0LmxhZG9r
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAKhZKGleLr
+BBVLrxstz92yRYuBi8s8Ff3lFRzJs4BqKB8m6aeFbQHQMxUqTyPdmMOZJVaw0s1z
+jRI46j9iR1flcPjNDB17SNKEl2pM2xVChj1FxSb6GTVDhaj0FeWKQYiB8TGQTGVq
+/dLdvh6gJvt1VPU8v22REw3CzX+8LvyqcbHoYCkdGyc4dDVB8kR2tl+X3wzCnHY3
+m84kSPkRpy+NMfjTQv0yzPQ55WvBDQ6lJfbcOm7vHHdBrJeDX75G/A0SO9JKD//V
+1GomzGDSp8UndVZrPtooL4Gig7b0W72eLybMWdFhYXsyiDAIXST6avhV4d03+JmU
+NHNsU2M3aB8CAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wNC5s
+YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDQubGFkb2sudW11LnNl
+L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFCYCsuDjvCxZmjYdCYVzbDXT
+KlBWMA0GCSqGSIb3DQEBBQUAA4IBAQB6R4AmByTBgOqwVw+HDboYWl8DsXvH8tYo
+AKVkg/A81g1YXczlP9P2zQNMLAUJ8KmMWJ7uSsclg1VJzvtwrWCwBDbQ3tibK685
+qaxxcZk+nk+7RiwJqiXuY4rH0B4y7AgjI72i4mzvnJMcjc6fC0sYz4O1ZtnaOHA3
+t+v4iZGPxWw0mS8IWHlO8ss6OnMFeeWWThoxxMqK5qeFIxL4iMEOv5Fn3dNOraFR
+H2iCH8EZRly9upkcAddBIwR6d6yN9QdGehacPFA4jPZ9wXqTcYv/2Nt5OOv9fdNw
+zqfsY5dOVVVlGXOm2d6Tcg8HjBGWn6oo0ZUZGL1TI+XfHzGRnLgh
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-04.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-04.its.umu.se:446/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:446/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
new file mode 100644
index 00000000..6187cb39
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-05.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-05.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-05.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-05.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-05.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAKvT+IioFgOSMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA1Lml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODE5WhcN
+MjIxMjA1MDcyODE5WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wNS5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqYXZgi/tragv6IZ2
+N28lye+viBpKFoNam7n9r/VC/dE7/GPQvrQW5WLjAZwfERFJJddEn4vrsC1ugbTL
+vot5Se12a3tOrB9lt1ARtD50D7toUrjJSEoRz6fpTqBReBtEUZWJiSLC5aw7zg8p
+hLQ3moPHYX//ittNOq7Plnu0usUXgiP3LcmKgqOttsm1NsKay7ACupQoVRnrMJBS
+1nf31gLQ0RKIQoQwM/GQRLCAqhPP1NpdFFXQDvfIm6Zk3G+Tp0oFTYHEOUdf16es
+K5m9ybvLd5YSnns09Ar2SBZOZTvj1iwj9A+tJmxYGKMQOomWlHsZzMcIQMhpSFDe
+Oj6FSwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wNS5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTA1Lml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBQ1Zv0Hu7FhPM8ELNZaySIGkOMfRjANBgkqhkiG9w0BAQUFAAOCAQEA
+hqCayzGzTNJHy6jmfSatfPKYhnoJbwxwGxn+BC5UE+igHg7/QiOZOoH4cjfs1yBW
+rtc2jkVv/w9pNx8KJgWCcvH2hNiKVQG7/7GOJpGPOUjKlNGZs0m9AIIcEkHX9trV
+PF4wZzHDjC8cT8XNmx7YI710821Fj5CjY6088Bybpk07ASzWgfepEavyI6P7Rns6
+A1/vJ45dkJu77cqGhrnFSU7hlSVf8e5BQgHS/QxKs2o34xLOQjITemLPgUV5a46P
+rPutDEkpSRzlTFyJMoUU57pGG410y8F7TJ0w0zqi6coN+qEB8DH3rXmG3rRCLqpm
+ujZI0vVtQx+sTGMktkMb/w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <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-demo-05.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..a1357bee
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-05.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-05.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-05.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-05.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAJbNz2Ut6PxqMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2xhZG9rMy1kZW1vLTA1LmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ3MTRa
+Fw0yNDEwMDQxNDQ3MTRaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTA1LmxhZG9r
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJbIXoy1e4DO
+hBNnvCRv/k7Av6fxBYikDOzLQKJbtibVP9POw4fECon7c3GRiyB7lBUSPrWLkVM5
+tad4QzjFCzK+t+Wv2VBnDb22+jTPM1epyfEg619hbhujr54iFRCoZkbbDA5yQg7/
+xQsjUZT9jMZoFfKOb8AwwOtd6yUhpQmFxRyMUDgRYqOFBqu65V0zSiYuAr93e5IS
+FUDkwvDjuQP8AOf4bfvZLFepkYPELSLN9mw0+FMyWQd9LnyvKPqG32r95CpIp2ks
+f6V8uXiiLE+ZGB2WzyF4pNhyUH2nNVWIhdsOV6x4/td8oae0rAxLOcNJO2zmU44S
+gqY8LjrEc+cCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wNS5s
+YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDUubGFkb2sudW11LnNl
+L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFAzHqhqAykN2wf7NNTovucpa
+Hy8TMA0GCSqGSIb3DQEBBQUAA4IBAQAFAyn+Snc7l6KHh2kDtnpUOCfKbNtx9ALu
+gnh6ltcDDZHoxq0jQNIbQNGqzdot8esoPYntY8IWSsUjZS7SxFw5x5l+/JGIrBP6
+j+zHauVcWgXgChfR2OL+CwFh979lXZniUsjVHXBhE8LxWs3IXpOmCAxY0f2txi6S
+C7InYFK8vlTWsgGvZY4gV7RjTwP8K5OkBrg/rtd3DQa67kQRmu8kAXaJboPabTUv
+ETztMh0s9VwEVBPMUKyTETLvUVEnKijUC3XFHn6QB7dKc4K0MEseDwHklMHD+a4+
+XVpEXBWCzSEzde1b1UN1OpTum2X30RmEij8IrqvSnV9rX8RXu9zA
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-05.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-05.its.umu.se:446/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:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-06.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-06.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..c3850867
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-06.its.umu.se-gui-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-06.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-06.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-06.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-06.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-06.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJALN/ehcV8L+iMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA2Lml0cy51bXUuc2UwHhcNMTcwNDA0MDYyMjQzWhcN
+MjcwNDAyMDYyMjQzWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wNi5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+MpsN0AXHUbKR4n
+K9ZvqWzHe0WuGkR4dHl825Thw/DOG9H2q79HU+gu6BkDX+7CCd1izGJx4iNya2J2
+owsOXjIy56erYbDC07qpaOYYjHz45mblMxkcmMmcyNb4DNG70hIU7Y+XpYTWwTqB
+PVcJ4z1CV/fGb9jX9OppUMFL1FRa1WYdJLJk7jqgbgIvgjDqHkEG3ueHb+WmycKS
+KJuETj1zR0iBGqgwGc4M+HyAdl0L4++ixVGajWlgdLKk0Cq6tOs5iIDx64vYPz3G
+12cOF48bJVXyMs0G4pg0NyefUFyriHl01X1HZkgDRrZHnE/Y2ME/MECr45ueZ0Yn
+dCNLHwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wNi5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTA2Lml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBRPcolkRLoZH9vGEm6S/zK/TnorCTANBgkqhkiG9w0BAQsFAAOCAQEA
+R/6yXPkIsfQdqDlpXqsSyLe8EbZeipE46VSFjCfF7mbuTLUdfBvSc1XySGkElgDI
+C8+f2KgoJFYEFQFlHra5VOzB3dJ8ucryrfkQ18EUQ/H+fliVtCWqh79dRHHOfSpA
+hmBrWXKR8a72dCGwPajNjYv7/GSb+1ieU4uvWRwbo/cXTBfhGj/nem0IDLZxx+9Z
+grkxvSi5JphyLG7fKFtapjov4M/gjgaPQfCr5iou3hASrx7efAI/aQUKRqA9QcS0
+3pkLDS6h0+ejPxEGA2ZF8E0FAqiV5yyFd8Jw6RCdaeL118sYeN3ELswpNXui88jO
+f7IGYdddWXE7gdTY0pPDUg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-06.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-06.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-06.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-06.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-06.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..5fa637f4
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-06.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-06.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-06.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-06.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-06.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAP9iuZwfv90DMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA2Lml0cy51bXUuc2UwHhcNMTcwNDA0MDYyMjQ2WhcN
+MjcwNDAyMDYyMjQ2WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wNi5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAto1iFTw13cIt/twm
+dFmUFi0vYlkQrzaewCkiBERMfg37ztQSKT2ZX+cF2R3630/R+WnZaBoK43+8Uv3a
+RD8qmfdy8+FJ5rpfmNlP9Hu233vy83hZGUOfJ3mLx4vm39h75PcLMG8qeCKLMfK+
+Lf4pqs8zicgJMp1ezjMI5c+soZXHmy//FqQQGNflGXfyeMwySKybU/hylRZ2spXQ
+yhYTyrmB2v1qUaClaXS45kbGS2l28/FAADa8ziNRHx/7zLopC6XhMBZN1JUYxMsI
+sUaqkH53tXrObNRWVP2oJbKbZFKUjdW5Ga6w48Ww5F4Pgqhm/aI+vSpOBM20S2Hd
+5q/KMQIDAQABo3UwczBSBgNVHREESzBJghlsYWRvazMtZGVtby0wNi5pdHMudW11
+LnNlhixodHRwczovL2xhZG9rMy1kZW1vLTA2Lml0cy51bXUuc2Uvc3R1ZGVudC1z
+cDAdBgNVHQ4EFgQUmdUO1TqxkPFjc5XQ5EsZGKLH4EYwDQYJKoZIhvcNAQELBQAD
+ggEBACAICdwWBdfN2EFseoZSwpl6c14aD2D35CKuS3XwnetDuuGX7zWtd2H0R8jK
+oiiowLC68Bv3TdSubLyob+r3NeT48342grIWOCIBBlPkszY55l1vqzocz9GrX9Xr
+6py8MLD3JULwIvkUefZ2an6dKK57M4b6CI7ZCfgqWRASN6pigtzkzpCy6eCvID4k
+KsDdu75RONm3IWi3P/AP/b/Sf7z1Ye6GRC/WcZ5q55klXgUxySShYakey4cYg6EZ
+vixrQBQ2tGpzvj5hSQeUW3XD/K3zlpxwVP6t1Y+Gb2xivZ0dk7Gj+0KitflAjOZO
+OL1ilcBx1eKIRVjMVh3M2iBEJMg=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-06.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-07.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-07.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..f1cc7345
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-07.its.umu.se-gui-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-07.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-07.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-07.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-07.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-07.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAPy4o+6eAvfkMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA3Lml0cy51bXUuc2UwHhcNMTcwNDA0MDYzNjE3WhcN
+MjcwNDAyMDYzNjE3WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wNy5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsDZZhpwLqM92doz2
+zMOSm8li3veSjZpxhDnYdetyS1At2KHglBH9FAAh8qxOkKFclx5KKxwM0tn2wwQM
+DFWcJyIC5ozOxBdOunzLmmo0KkvnfR7N3ahfs1WzpcO37xA28E2xcGuLZoVykKsB
+w32f8ozLO/xeUfVyTcSCrnKRMgcS3ntTZQ3kUqV8/9ULINrCustUeCGYrceNmZlR
+s5FMvW3LlSs8IFIV/cLLzUO+5N91YYkqVAiNNtbIRJNkQ295Kb/2543h6Y5CQyzR
+gJRA8d9t7RCZSO5Ci0TQIAseaQDEeWr+QHpMx1iRN+ds6Xo9qZv5q3LEpywiDMr3
+6X1IjwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wNy5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTA3Lml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBRLSELzrgKSQ5wQDiKVViKi9N8iZzANBgkqhkiG9w0BAQsFAAOCAQEA
+jr2qnERpQIM2lCEjW2rC4TjIcEsOFOM4mXEaT+AdTBuyUHjClCMuINFVr+Zbj+jQ
+QjnpuW0EQ3opqARjGi8GOo8tQtkBhUrFJiQc5cAxZrv1IQ3PBqKlKj9p1ksNSgVe
+dCu9WaZEHcZCkIh6rekLYFKgNOrYHLskzzC1N7hQmvePCS758fzR/RGRbpzaAFWZ
+WTpLtYYOTmMALdmSyfa8Bifnm1N1tOVcrh25HhAIylowODccDuXDKfnhXr+hZe5I
+KOVbuzv8JxQfkdH8rKPr6qCdzb0WcGvO7dMmTqovGwBE0imIeFp9i2hpnQ+Y3q2j
+l/JXfxEEB9QV3W5Nuv5o7g==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-07.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-07.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-07.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-07.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-07.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..b0a2d789
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-07.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-07.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-07.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-07.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-07.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAP/Zzz8uRfZJMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA3Lml0cy51bXUuc2UwHhcNMTcwNDA0MDYzNjE5WhcN
+MjcwNDAyMDYzNjE5WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wNy5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyEpU56FBU+hpw/PN
+itWXUP739IZ/8C1QYLI2ZQwfvuW6hRSMVli1mIHBE/S1PwUU8/6IXuslf/qjTfjr
+fAD/DcfJ6P9zGL6Lfc3ysZ+UMTBMkUnKuc+m5kjVULQXBNsnxICp0rPrhPLeOpIn
+A9vkJ9SUUhDSbTJz2YZbqSrZqYxQdw7ZvKx7fNGRRy3y2zAFwR+vQ8aEejEsRF7X
+5bP7yXWP8SaNnl27n6OywKu7PSfb4OWdNK52w2Dr5cF4VyUWr6MWSRgtLgP3d6D0
+ZCyoQmW5LbQGtIBygKy1spR41oYdD7RtiIKY9J/L31EcEeBEL+Yoe4RssfXhQmuQ
+KSZWjQIDAQABo3UwczBSBgNVHREESzBJghlsYWRvazMtZGVtby0wNy5pdHMudW11
+LnNlhixodHRwczovL2xhZG9rMy1kZW1vLTA3Lml0cy51bXUuc2Uvc3R1ZGVudC1z
+cDAdBgNVHQ4EFgQUPaKWO+Z6e8GDajvnHrBKPO6d5NwwDQYJKoZIhvcNAQELBQAD
+ggEBAC6OwRO39TNguojpm09QOG9angGQ4Cs53SKVnsM7kDH41qCDmEBkp93baRY0
+nM77uBkQEP5tuysuT9rPJPj0waz5T56elVQeAPpAVxgmUFm00/b2G7vctoFwuvVn
+97EBcC9zLezTroRHkcccTyOu8FPfypGNYwsz11leCN0TO7McDxFYiO0c3iu19DlD
+6dcZiVBCbH5hlXRxu1YOIR/b5leq3PmrlPkrmWxkQ0w9z3V17++pbMbnbDS8EyxW
+mRMsVsLU4STyMblE22z33pJO9hMMc5c9a3FPUR03FQlLCjATHMyWZ44bBZz2XiRH
+HgLe+HJUkJPQ94tz4VtnO109+7Q=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-07.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-08.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-08.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..b55ad572
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-08.its.umu.se-gui-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-08.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-08.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-08.its.umu.se/gui-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-08.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-08.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAI2t+k78fqmTMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA4Lml0cy51bXUuc2UwHhcNMTcwNDA0MDYzNzU0WhcN
+MjcwNDAyMDYzNzU0WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wOC5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7LfpfLVNRUhcqBRQ
+zvWsY35F9nJCrR0x6jXBZuUKzuhVisn74MYYkFtNCctDrmJsY5bMoWb+46E/7Ntj
+YvO1KTlBicfb5A5RVp1gK3s0DGUqXn0wHQCZ+xwhFRR+LIu3QBr+PIFFAq+KkZnV
+YHyMpUEU7IsqNsFWN11pQonBYZafuBRwhptwLUyfDXVbMt620Cq8g9UPBsX9HQAP
+KI9C07y5p1ksiUFFQErH+TL5cUtti3x+UblkzJaYsqVDcB/ULniFeMKX/f3j0YNg
+PdsUiAoaWU0r/22RcfKqbQAMnxkNrA0c4Y5Ih/TQVhbf4Kdanv1G0h6PUoHxc5ib
+YtfRWwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wOC5pdHMudW11
+LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTA4Lml0cy51bXUuc2UvZ3VpLXNwMB0G
+A1UdDgQWBBT/uL7WBBtoTaBQcm9gZrAMoupHqjANBgkqhkiG9w0BAQsFAAOCAQEA
+DJCFuu2Uhu8SgZbiSkKtW+geh/UNvydlz3VICumdorIJOmMa504R5bMfbReA2nZd
+2h5+tvyxh0TUXmcYHpP/9uH0o0mxi92IxUp9R2SELPI96G+K77X9UgN/i46F3RBC
+ikT7ZSQ9PYSOBqVUEcLhIdQYHYOk2r4B7gqpUesmV27/xAffdJ41u9gs1zGjuZLk
+maSBnc2Bv8v+UWDBmprq4b23wGr4KZP/PPBmiCZ9HmfXkZAD7OLXLBbmpv+mc5zj
+5a97R0zgZehSAoSIDM9jqR+aSW79s4VN9hiITql/b9erQLVWRKikVVk2ISuhRpD8
+n1HcDYOPSoy7Pf+JOg5H2g==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-08.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-08.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-08.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-08.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-08.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..62592837
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-08.its.umu.se-student-sp.xml
@@ -0,0 +1,82 @@
+<?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://ladok3-demo-08.its.umu.se/student-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </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://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://ladok3-demo-08.its.umu.se/student-sp</ds:KeyName>
+ <ds:KeyName>ladok3-demo-08.its.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ladok3-demo-08.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJALsTeBavCzg6MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWxhZG9rMy1kZW1vLTA4Lml0cy51bXUuc2UwHhcNMTcwNDA0MDYzNzU2WhcN
+MjcwNDAyMDYzNzU2WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wOC5pdHMudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuTgBFjyjZ8T5CcL
+FE6k8j7kQBeP0t09HFu5vgBbGGvKxgCc7KPGUcbdHsmXweOGzPVzTNYzl9fMJfmt
+5LmPzK7OY5dT2d74HXJyzhBSo2r2xKXBCcB2ohj4T2HeaCVL74IqJ6naxc7humUx
+PSyBleZzaq5DUcbc4h9lJhQjkP0P/b04D4XiEIZzMZU3hMRTHe6G2iLvM0jFVkFq
+ovAGTf2fWUOJ8/r0FY8VRV7vEgk7qmfXPaa3ASzs+fVkSFuQv1f3kNNKDFFg1Utd
+Axh1yFSzNWCXpeTcp+qBHGzthQKAm3oZq8fqZRt+sV1ky3vt0o0m6Vr8c/FmGFrj
+6JCYEQIDAQABo3UwczBSBgNVHREESzBJghlsYWRvazMtZGVtby0wOC5pdHMudW11
+LnNlhixodHRwczovL2xhZG9rMy1kZW1vLTA4Lml0cy51bXUuc2Uvc3R1ZGVudC1z
+cDAdBgNVHQ4EFgQULoJf8ySCdgfnUXoN54fPxwJneukwDQYJKoZIhvcNAQELBQAD
+ggEBAJCjJ7LjAvDV3e4rWUnjkadU+h7VQviMjccpmmdvFl0419OsEltdjvXphG8I
+DrfL7GKNV6Hwr7aWPH7y+M6DRkEaUfjSFRnrD1WfMNpEJ0z919hNpMAYfttMNL95
+pF1krUgA0RGlGuLqj5XTmyybGxSKvAyA0QaXOiyhh4ALnMcO1r2+8jOLa1dPgYVN
+gLfDeAAk60r7V+hrTdfqI9Jx/JBS3+cm+HXgN7iFEyVYMjxhkWbFCYFp4JYvtBJQ
+BsTqlHuhwUeuVgVI4MgFl2SE3xBnu1kIRx4V6fk6wftPlX8vqE69GyfeAIqxumSe
+/aOHGm1E/xlmwt3+kALhwjZkKQM=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-08.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
new file mode 100644
index 00000000..5650fe30
--- /dev/null
+++ b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lap559t.bmc.lu.se/shibboleth">
+ <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/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">lap559t.bmc.lu.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">lap559t.bmc.lu.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Testmiljö för RedCap</mdui:Description>
+ <mdui:Description xml:lang="en">Test env for RedCap</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://lap559t.bmc.lu.se/shibboleth</ds:KeyName>
+ <ds:KeyName>lap559t.bmc.lu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=lap559t.bmc.lu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEIDCCAoigAwIBAgIJAOV/oeb8QXj5MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
+BAMTEWxhcDU1OXQuYm1jLmx1LnNlMB4XDTE5MDIxMjEyNTgzMloXDTM5MDIwNzEy
+NTgzMlowHDEaMBgGA1UEAxMRbGFwNTU5dC5ibWMubHUuc2UwggGiMA0GCSqGSIb3
+DQEBAQUAA4IBjwAwggGKAoIBgQDDl/X1oWvgHzSpMPHd3YFF6VAOSGSrhNIid9fn
+FKXbe43VEGEDNGJFOUgIroElsi5YM+eo8CjINYPxHMnsGQkzkTo7wwgkDtEbmDDl
+qm0bailhJFrJPf7NOa5OSFdy54BS8ezBw8kjpvkRWHYFJeh/fkO+ZJDG84SA6crS
+MaaPIJ75ZMtMJLy+xbPMJ5kHs4/+H59YPowrUz5xJNf0TECRB9ktgJGiq1xoqDEk
+RCWuVUukEGyg4HjkUBh2RdOK+9f2ws/7QURzYd46hPixQNUl8Q+Gn6yPETrIZicv
+GwT43OJqTy5lkhQvcbQ7QT7PkjILmAo3oobV1/6rBicD2l2HMukE68Ue0XMIxsib
+VxTtVCMPqa2xWIbu8GteaAWKFeJgdzcJ1mqm0wMReZpZrJTJFSdwyi7OHyQvBmpO
+yDolp2xdKjVFh5EfNMcQaTW9qWHmxlVe1mvsVZhSxNHA922Px4R18vnIfNug8lCK
+NYNpDt8RyKpT7gALFhzru+PwC8ECAwEAAaNlMGMwQgYDVR0RBDswOYIRbGFwNTU5
+dC5ibWMubHUuc2WGJGh0dHBzOi8vbGFwNTU5dC5ibWMubHUuc2Uvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUK3C+ed//PJ/RwVYDDwVPAcvlEigwDQYJKoZIhvcNAQELBQAD
+ggGBAAwynHyxBNZbGjzAdX1PDy28RR3SkHkdENsenXqMs4Urdyv6XS2/GJpXoMom
+JvkADde9jbfZXoHqTlXT5+MsyKDBhLm5r7Reil1x79e3HgzX3EFScWiHL/u2j5bO
+OVXb5H5BxzXStHaaChKtVoNyJYBUhxQPHbEHx8kl69/ulB3DymgeE1x427Y3wlIu
+bY1jlk9U0a9ATWils1hw2CqJHZVjtNp8Orco8NrImye6zbAA0IM1L/sBkYYVDMxM
+nFqJb5+nI+ozY55LIDaqFSA1adtQO7yZSUEEzYpnXTTBd7lUIEyuKEvuOit9aR/0
+96PGClEoFX8cBXPJsx/5gyrTulb6cHjQ3NQCkl5YA1YwTQQ0hKWpq7HuYenKdD/y
+H2iIX8nDZbYRmWd9t8bfu14cbr0HEQmLIrjZxztptk1M/piZSjLIdlmazJwVD3eK
+21iKOwitYcBV2amyrdoeS+zQrcy41Z4zoVe3TK6u5azgitrwXjh1FZWMCiV7QbqT
+PVzLTw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://lap559t.bmc.lu.se/shibboleth</ds:KeyName>
+ <ds:KeyName>lap559t.bmc.lu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=lap559t.bmc.lu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEIDCCAoigAwIBAgIJAIpa8KvQlZJeMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
+BAMTEWxhcDU1OXQuYm1jLmx1LnNlMB4XDTE5MDIxMjEyNTkyM1oXDTM5MDIwNzEy
+NTkyM1owHDEaMBgGA1UEAxMRbGFwNTU5dC5ibWMubHUuc2UwggGiMA0GCSqGSIb3
+DQEBAQUAA4IBjwAwggGKAoIBgQDIqNXOhz+fPPg0GKrzPvSWkzbFRtiBFijCA2b4
+705o/2QpZn7JwPkBQN5JIc7jH0Yzyea7NKh8CujaQMZf4W/TS0kRz7riKnnYe3tH
+XkMAI4TXOSq5+ZsTIDyLp1X0g0xooAL/R/E79h91qdwKyuWsRju7wJyt0ITxRG/a
+ye0uLyw+5htcTiJPcEBEph/LyzzjBS2msvXAsuJEYpk7QRdEllapWTmv+8EbGyhR
+2XYchR1O88X8FX9hzaEiI1PbjnHVMFjbPHx6AuqA68a2gIMzfQflSQScO+gdSB6b
+hW224OcD/KPw8ZF9k+Gy46yxe9qt9wDeCFkZXKp5RP305DkzY9gJrAtKZFbg6ff2
+1w838aapJ8WNv9U8vvfx3BWjp/A8ErldTgShi+jdI+acKK3n7Zbm8jp8ZxohBab9
+AChW1TVQFPD6h+FNnN+Sh8HKtemV6XbIfTS+yJaC235k7WMnFhkm7etKVbwR+eN7
+v3uHn+4igEFDoadNWl085xTfHWkCAwEAAaNlMGMwQgYDVR0RBDswOYIRbGFwNTU5
+dC5ibWMubHUuc2WGJGh0dHBzOi8vbGFwNTU5dC5ibWMubHUuc2Uvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQU5ZrK4rpI6kDoCNplU9L5zgQWbaAwDQYJKoZIhvcNAQELBQAD
+ggGBAKT1ASiUQtve++0DwWJZxS3uFRzDi8SVec0xpGdBqi1YmZkeDUQpal798V5C
+de4bOI5QwH6OX1AwPcpCO4/z2d+rDy/1ZLvQTgluRvp7VVL09bPtULvXsVFi4HBf
+FhlLQzTEQC3lTChst+TL+pflXG+SW0q/ifCxYiDN7MyWjb7xIrJo9NLoNnz5JCZ/
+DYhK7JrJDVkUvC/3DKtxUSsUVvBg0FviSmVJPstAghGG/6jUGYDaq/tl2sSFdd4R
+8+88ZKgX2xa8ljKRVhMr6Fk8ACmru8zPog/nNDNw0xwdIUzvskFTh26FSVN82jzY
+qL/xDEaKAct0mvvM+pg0mIW+WQAkNzqpRDhSRlOw5uQOkd9SYbxSX584AoRoAl+2
+vpv5eu0/jNUJcQw6qXwMfatiAlqIzRGNVsc7snZZPJZ2i2xIa5i/8AGztIA4ORN1
+AXopa08IHsDtwXLELhyAO91uDv/FvBt8WPMgwX+rTaeCG6m6hrEsfb3/Uk7gSm5b
+dl48KQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>Rikard Johansson</md:SurName>
+ <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>Rikard Johansson</md:SurName>
+ <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Rikard Johansson</md:SurName>
+ <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
index dc4dba0a..fe11c9d3 100644
--- a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
@@ -7,6 +7,9 @@
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
<saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
</saml:Attribute>
+ <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
<saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
@@ -17,8 +20,8 @@
<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:DisplayName xml:lang="sv">Linköpings Universitet - old</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Linköping University - old</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 height="68" width="350">https://login.it.liu.se/images/logo/logo-350x68-sv.png</mdui:Logo>
@@ -209,8 +212,8 @@ RZPA+Q2niYC920FIv6uscwfFJR4PEFBA83wLSZ39FDm79HM3TNQ9KFtgLY8=
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">LiU</OrganizationName>
<OrganizationName xml:lang="en">LiU</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Linköpings Universitet - old</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Linköping University - old</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
<OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
</Organization>
diff --git a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
index 1c333e31..16801cc7 100644
--- a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
@@ -32,7 +32,7 @@
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC3DCCAcSgAwIBAgIQeWr7QXhH9JlNlt0yAGXDnzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBsb2dpbjEuZmhzLnNlMB4XDTE4MDMyOTA4NDgyM1oXDTE5MDMyOTA4NDgyM1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gbG9naW4xLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfSk8YUwkg2sQvT4Rvo3eHVG6E0TSKvd2REO8iTzMpmMS4D+xRmduJi/d2GBczY5GKzjsm8Ykfz/kF+0zKUyLXjSBxyf1c/HY7ShULcZQI2hYIk9pIafLym1log++Yq1x7A8toQmbIqFQkNfzerb1FSlHhDH9y1ENcVY57Xy4mQGXGdgvUKB7cID4hHPfLvNb9rECmxnznb0aSfumIf169LA662B2QcZOfvdC6L+/okJLoa69X4/wkfYhyXXXaCCmd1EGN4CzXiPKD5LCDFC28hhAC6eaU4e0z+T3u8+HQZTkAP4QnJk18NDqDeS9BTo7iifwjOhScIK+WOTGdgxB0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFqWIanhTOtPbdyNc3ILtasZPG7srR86xgIUBL4Bb5RZbdEsXSDDYnJGsstwgKb0f8aGeVUaqgq+a/VrNwMIaTbj9bMU85kcJuipj5mhsJ1YY5zgPvpK1uum/AWjPHjn21JQGpqfxJngGJl54FWNhAJL85k+H/3MODSIzrH5Kmyuq+1qU9E5vlvoVJn0WPxowJS7Y9PimatpbNSio/lQ0Rk14GOn6C2/NwBm3wGqpRqRcYsXoYCGDL9ACbiUiBazcslBsURJsTagU68UHytrSsifzRiUdpzOzCf8FICfLDLYFq010hpSUgRWp5uffHpZGUhoHh2tjDym3XZ3TyH70GA==</X509Certificate>
+ <X509Certificate>MIIC3DCCAcSgAwIBAgIQN1QM8QQFP6ZNW99UMSdlijANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBsb2dpbjEuZmhzLnNlMB4XDTE5MDMwOTEwNDMzNloXDTIwMDMwODEwNDMzNlowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gbG9naW4xLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJHe/dPn/7TKSrggy6m5nj2Ng2OBatAAYkC4PlnHpuxKSnfL6s1iBb6wPVcid5UW/CYJbEF6wx+DuAOLBumgnM3XPwRUcfpj2H3IDjzRQrzEtcuD2MyOd0B05Qu6/DLvYWHodyDS9hlHzo9D0ynCEJ8X2UZADOVmf6ynKF2Z7WbyuY/I/SxZmSXlBbyiGdbep1iPQ23qPjKlkNjbFvvbIYrvRo62aVJJAaN1LhtpBopiUoS2IkyoqOsXQ93DEIy4RRUWaAsCqzxn5A44YsD3dJtfo19q3bnYQqQaOBvUeYFbhL1WjCuAUHymi1UnjITSwuLa2Y7eLVm4ilXSAmzCZV8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAgvzRfEYR7xMVJrgOZyFra/7/ntgThAsLfp+EyT0wFmyNAVhTUO++hkAXBsboOTKiPxGRFhcZVsbnWO6XIzlQtB4ozaYfAlwOkizzCcjEyTUTqkcmxLyiXoxx+oQ+EJLfgXEToY/MWXB+g5A7P2sF+bpmAEw8u9RTW5GCsOTO+9JRSbW2yCWiGf5BN8q92w8ZZKIesJsC9CEDba0Jud6rSskkwhKqcgMhcW+80mmvkF1MqTfJPgmNTOdI/4csMxPNgLsYMrs32U88yJjEeZKYozf2GpQz6D4QaISLWjGDkODiOA0dRnEJsCKbOgaQJnEDaV/terraKvbOmUdXfqtDuw==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
@@ -43,6 +43,13 @@
</X509Data>
</KeyInfo>
</KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIC1jCCAb6gAwIBAgIQK0qEaX+opLRN4C74lMlLFDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbjEuZmhzLnNlMB4XDTE5MDMwOTEwNDMzN1oXDTIwMDMwODEwNDMzN1owJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gbG9naW4xLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9UCzDk4ssmEmWBFJzlBI3/dBOhsV6OVYbJlWZL3MrcOsleDTlKPTdU721uWligs0UhaZCfumGE03DCRcNK5sLBtp79ZxgIxdmenTQiunUhdt4c5cC0JlnzuBWdiiL0MbSNt5ZQ+LTDyJgXVIEaQt6y5bUYxzfHwXjvsm625nMzV9/niAWprlBkpj+2PUZmIh2jzQBCmjv5zEHxIc794Ks1qkx8qJO8JIU5ybUe1odp0Xnfsk4VWBmv1Vc/zexbv5RK1URiRbJk+uR0KN7s4xlm7Pm3ndA6e8evSSMbLqWnNsQb2PUN4zS/MWffOS/vvsKTWe9XBJDmUDKkaLrlZJECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAB6PMVhpGpp5Kyzcbn0zWO5v8DkwOczZcnIBt3DRdkcWO6w4TpfQm11oG8Gwz6+4Al11eo08qXy71YyLLi3nmNWg+c56dAHJFTiUg3kaA5igMrBfK0Tl0gFK6LCZ5BaKsnEHH0zu/Yxrf9yfv05rBafIZpVhwlcGVcNLumK2WXrfA0VhQLJ4elQ6Bf6hKDiK9erY3Px2CYAdvuNJQ0yrQlFlnFoIGpNG0DWe11tsUzodyThrs++fJl571U/V96EL6BimhuUBwomMQpQKd5FJ4OjaVsJ6Ib9K3c5YRdrf0gxK/LGK5Bmj0etyYU8hSO+KxykQLpXqNtk8V++0UwYqcLw==</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login1.fhs.se/adfs/ls/"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login1.fhs.se/adfs/ls/"/>
diff --git a/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml b/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
new file mode 100644
index 00000000..7d56a3cc
--- /dev/null
+++ b/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://se-su-shibboleth.moveon4.de/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <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:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Moveon SSO Service</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Moveon SSO Service Provider</mdui:Description>
+ <mdui:Logo height="300" width="500">https://static.moveon4.com/sso/images/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/Login"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>RS</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>emailAddress=itsupport@qs.com,CN=RS,OU=moveon,O=QS,L=RS,ST=RS,C=UK</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDuTCCAqGgAwIBAgIJAPc2iKzcTP1qMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
+BAYTAlVLMQswCQYDVQQIDAJSUzELMAkGA1UEBwwCUlMxCzAJBgNVBAoMAlFTMQ8w
+DQYDVQQLDAZtb3Zlb24xCzAJBgNVBAMMAlJTMR8wHQYJKoZIhvcNAQkBFhBpdHN1
+cHBvcnRAcXMuY29tMB4XDTE5MDEzMDA5MzM1MFoXDTI0MDEyOTA5MzM1MFowczEL
+MAkGA1UEBhMCVUsxCzAJBgNVBAgMAlJTMQswCQYDVQQHDAJSUzELMAkGA1UECgwC
+UVMxDzANBgNVBAsMBm1vdmVvbjELMAkGA1UEAwwCUlMxHzAdBgkqhkiG9w0BCQEW
+EGl0c3VwcG9ydEBxcy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC3fRJr1M1KrunNzY60ASrecV0i5+BASnmVNiETQJv5ZP5rdNAW5tS4fx/6uibO
+cwT0HsiqSSPcJFZ0eKfcUBYVLvep5finEY7JxbX1t/FT4CV6kuht2hwctHri0lZ/
+23jSkobWkZdWs+Phst91BslpaJFK82r/tUqf43eK8v/k4Uc+2zRaKVUvD2TWEYfB
+0BP/T1e1+EVUCRQfbDutYoCts3LIvvRmJnolC44wFuHv9qRuYaPAJ6REnesFAWda
+mq3DmMhWy0Qm2fr/NNnOOTKb6NruXI4KkAjFKheEWl+omNurNW8M5Viv5ETRedFJ
+nd7REtb/eC6UU7PnjtWQgjU5AgMBAAGjUDBOMB0GA1UdDgQWBBSWxE28J0q6IRu6
+RdBkZT/8Usvc6TAfBgNVHSMEGDAWgBSWxE28J0q6IRu6RdBkZT/8Usvc6TAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBVPelS9cBoePdzPq+PxXaiqM5W
+WjfJTKEm87YyntvjKAl3rkwNuG8OlbSB7vJ5wG7Tff2fkeIAc9TtQbsHEsy8N4Be
+lULYGlHhVR9/XTbgIiJs/YdW3v820oXk8XwjL6w5YjKoWYgtvibbwixTgQFPU/ac
+1Nrn7GM1GKNZ7EhzVb3cZ7JxDVKzKtfdxbtummGIWPpcnnWzgZQmMRZPla7zFN5x
+Q8Fv0Ho44jWwNsYplcP3MJ0oKV0bz4xqcNsKwP/bAn6RyhSvEzhmM5SuDAnOUlj2
+ORdz4OYhGDrkzrDGPPYK74Je3Ukth57uYoySsyMM5huK/adFEbHOg8L6/ngd
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SLO/Artifact"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SLO/SOAP"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML/POST" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML2/Artifact" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML2/ECP" index="8"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">qs-unisolution</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Fiona</md:GivenName>
+ <md:SurName>Gutsch</md:SurName>
+ <md:EmailAddress>mailto:fiona.gutsch@qs-unisolution.com</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Harish</md:GivenName>
+ <md:SurName>Gowda</md:SurName>
+ <md:EmailAddress>mailto:harish@qs.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
index 6c54b767..733c4c24 100644
--- a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
@@ -59,7 +59,7 @@ and do *NOT* provide it in real time to your partners.
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/Login/necs.sll.se"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">SWAMIDs SIRTFI IdP-test</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">SWAMID SIRFTI IdP certification tester</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SWAMID SIRTFI IdP certification tester</mdui:DisplayName>
<mdui:Description xml:lang="sv">Verktyg för att testa om en IdP har markering för REFEDS SIRTFI i metadata</mdui:Description>
<mdui:Description xml:lang="en">REFEDS SIRTFI IdP certification testing tool</mdui:Description>
<mdui:InformationURL xml:lang="sv">http://www.sunet.se/swamid/</mdui:InformationURL>
diff --git a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 7c0f148c..d62a9078 100644
--- a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -27,6 +27,8 @@
</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://student.utbildning.ladok.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utbildning.ladok.se/Shibboleth.sso/Login" index="1"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Ladok student.utbildning.ladok.se</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Ladok student.utbildning.ladok.se</mdui:DisplayName>
@@ -42,24 +44,24 @@
<ds:KeyName>student.utbildning.ladok.se</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=student.utbildning.ladok.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJANWGWILs+4v7MA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
-BAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTAeFw0xODEwMjQwOTE3MTla
-Fw0yODEwMjEwOTE3MTlaMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5s
-YWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiA29pFRdt
-4H7Uy+++2hJrHvhHVxda1Cpwe9uhaR3d9XAJGoF2+nczjegpx29iOfNZcU07w1hY
-rUL3e9iZWVcNX1TY2qrqKr2SU1g7cVCj0OvdrHMC0m3JSPgwqtVUN0f7JZRKIke4
-Qs+5U15OQ727wng4hZOrMhbsstRs5mqFCeKU5jRpJHc5EZE9yZ/Nw6Tk6waiMStK
-BL6Hvw9YEbsiOYOarYrFoe+wLwXtOk4lBsBz4+0F8xplqVn+9fJVRbcV6dYW/+9V
-5kRIwZUIR6/PENnSJDgkLiibdA3C5kgR/1BOCDNf/MIvnn8pUIvHgJuTae3jQ4vh
-i7N2vp+HBSECAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudC51dGJpbGRuaW5n
+ <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJALnpkw7cfggwMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTAeFw0xOTAxMzExMzA2MTNa
+Fw0yOTAxMjgxMzA2MTNaMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5s
+YWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZ2qgLHZxYr
+aUrDO+0eh4L8h8yAqjarlJeiaa2G6kvaCPjrMhCN1Wf4eViCF6/YghRUd7RKSZ93
+2vsU++auFW1tNOe7nWel0S+PuX/u9QR1iX46t/V89LT62Q4svOxcO13phcKJ/0vg
+II3ojZag8yg26pZxMk3qsmFFNrh9or9ezZHEmUQUvIv/h5bqXEuZBYWfSfOcPJUF
+bwzXl7lul9WiHvW/GYdokFlgNTxhtFZjWa7P/bcojv2gBIszQ4EyPXdYkHU1sDfK
+A7w59dCBY2RnWsyx/CEQcedmlCZoXiandu/DH57bRZmy7MhXg+fqOXufo5Vu+uL+
+RN8xqpD4gJkCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudC51dGJpbGRuaW5n
LmxhZG9rLnNlhi5odHRwczovL3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZS9z
-dHVkZW50LXNwMB0GA1UdDgQWBBQ/tAcKKj6mkEtXqP49iutZjxHtwjANBgkqhkiG
-9w0BAQsFAAOCAQEArm0Nt4YgYQb8ai64Hd3jfLURQybHK26AOoHX8Sow2UbVsCAQ
-7uhUPjhFgifXsAM65C7FqFSIAmutXJjDmv6/07qAOVBCW7VtQDsYM4t7QdU8iopA
-2ez0lzn1hAm2Z49JlUNSkakEs3AlwpY4Loz4ds/K/rnOMOIYI7FcrfHbpEhh+Oj0
-abindr5OqikITCaAg6pqRhiz/I2wV4aTdYqu0aZGEdNb/IyGiSx+YpnnyXjIcGJi
-ASY8w7i9u/rePnx86zHeAWzcVoBrlN/PbewEz1y33NaTdIT/KyyTD2KVDRHMsB6R
-b+EKciM0eU4lA8+gpWytbGV/3IlWWQSHfA9RUg==
+dHVkZW50LXNwMB0GA1UdDgQWBBS2/G4RBH+vTMQT6ptLqg/vB6YKXjANBgkqhkiG
+9w0BAQsFAAOCAQEARhAWHyQee0ndMnQWqHSzsFl1Mn2gSYCgpsdzJSgrm8Lsuyq+
+sf6pfqQa/auodeqFrBwb3UNpyFBuS/du6XtqsQMbick3aIFJ5aHRr1Z32dGKNtyW
+Ezn8ueDPkxkrmTMkX4Q+ehIkb9RHMGM1LABx3LR4OeJ5FxZnpwHPoi9VZn79OMuf
+lrb0HK3oComFcluTV4lDDQRDF0HoHsT1E9iPnMA3/lIzKxHggMYWDoue9eOj3yrW
+2gGzkhRCADBLAvLcEU4Km8a4VzDbEiY2oWvzTYCxb8BoMmJtECDRy/QPocGlN9Nc
+4QUn2n+nWOepHcuqbgJkRgcnFJrdcZoIu5GHMw==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/sunet.instructure.com-saml2.xml b/swamid-2.0/sunet.instructure.com-saml2.xml
new file mode 100644
index 00000000..4fd8d570
--- /dev/null
+++ b/swamid-2.0/sunet.instructure.com-saml2.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="http://sunet.instructure.com/saml2">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Canvas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Canvas</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Canvas för Sunet</mdui:Description>
+ <mdui:Description xml:lang="en">Canvas for Sunet</mdui:Description>
+ <mdui:Logo height="46" width="192" xml:lang="sv">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
+ <mdui:Logo height="46" width="192" xml:lang="en">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <dsig:KeyInfo>
+ <dsig:X509Data>
+ <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
+GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
+IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
+FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
+MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
+YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
+CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
+IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
+xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
+JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
+PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
+pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
+GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
+A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
+DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
+mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
+BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
+XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
+1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
+Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
+SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
+ </dsig:X509Data>
+ </dsig:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+ <xenc:KeySize>128</xenc:KeySize>
+ </md:EncryptionMethod>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <dsig:KeyInfo>
+ <dsig:X509Data>
+ <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
+GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
+IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
+FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
+MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
+YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
+CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
+IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
+xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
+JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
+PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
+pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
+GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
+A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
+DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
+mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
+BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
+XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
+1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
+Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
+SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
+ </dsig:X509Data>
+ </dsig:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Location="https://sunet.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
+ <md:AssertionConsumerService Location="https://sunet.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
+ <md:AssertionConsumerService Location="https://sunet.staging.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="false"/>
+ <md:AssertionConsumerService Location="https://sunet.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/>
+ <md:AssertionConsumerService Location="https://sunet.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Administrator</md:SurName>
+ <md:EmailAddress>mailto:info@instructure.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test.valda.uhr.se-shibboleth.xml b/swamid-2.0/test.valda.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..69464db7
--- /dev/null
+++ b/swamid-2.0/test.valda.uhr.se-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.valda.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"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc: SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.valda.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.valda.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.valda.uhr.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Valda</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Valda</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Ärendehanteringssystem för valideringar inom olika områden</mdui:Description>
+ <mdui:Description xml:lang="en">Case management service for various validation procedures</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>uhrval-test.i.uhr.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=uhrval-test.i.uhr.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKrvj/quXo0oMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHVocnZhbC10ZXN0LmkudWhyLnNlMB4XDTE0MTIwODA5MTExMVoXDTI0MTIw
+NTA5MTExMVowHzEdMBsGA1UEAxMUdWhydmFsLXRlc3QuaS51aHIuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtIWX5i6gPePK7nbap8snxwcLqlCID
+LWZkxbQGCVIgixRk1w87yUD882SSZjUATS8JV+8TeHNIsRSkBeXB1MQQopeDtm5C
+LDhh/RxHL3IRBlhesOE5zWcc4xeBzRIBKb1OC773XbSLx1lQhZmH+fiQvEk5FfWG
+ri683HBCQq3gpc3hX2lY7C7oAxL7KST+37zLIBy7c83fzWr3eQ1myKZFfHBsmMOt
+pNjBNMG8V924gaHWKAuqDa6lds53PszYZh27bN7dWXRrN0vXEZu6zfEioJVvg5RL
+c0lUqg/yu8Dk9JYYm9rQDj007livs9QllR54wsIxosVQWhAz36ZFafaNAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHVocnZhbC10ZXN0LmkudWhyLnNlMB0GA1UdDgQWBBSG
+EGTlhQfKssjt+WgDPIKFHzzZEDANBgkqhkiG9w0BAQUFAAOCAQEAOHImN37aqOBU
+wicsP5vJ7X8yX6he/dAnRKhZbjWSlpFSZGwZrV/B6YeROAyRbzQH1fQRTup+angF
+B5m+vmxG0XjhUm8gXpMNqjgxaay72m2rPTVAkbqkMNTKNf44bRK5OGqPlJ0lwrnC
+Wh1+2EdKahr4lzJaqiW2rXvX3moTYqrJlssglT+IRTzoNbL6eQLdqCVvZxXDjyUb
+D79D+ECq8yjkS4/8EQlvHdHozRMMplJTo+pXoZwV9KZgMMsxdT63VuJ/0HRCxCMC
+zcmOSN36LTlSIYY4q9pC8MCzt5YqZdnKJUIyjFy+Mmjeyw4t+ouUjjI6+AifCten
+BwquFopAQg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.valda.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.valda.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.valda.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.valda.uhr.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.valda.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.valda.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.valda.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.valda.uhr.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.valda.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Olivier</md:GivenName>
+ <md:SurName>Brotons</md:SurName>
+ <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
index b3b3c092..af26ade0 100644
--- a/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://testidpv3.lu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
+ <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+ </saml:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+ </samla:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope regexp="false">lu.se</shibmd:Scope>
diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
index 82b159f5..ec05a14d 100644
--- a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
@@ -5,6 +5,8 @@
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
<saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
<saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
</saml:Attribute>
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
diff --git a/swamid-2.0/wiki.its.uu.se-shibboleth.xml b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
index 95c252e2..2f593bf8 100644
--- a/swamid-2.0/wiki.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
@@ -4,10 +4,10 @@
<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://wiki.its.uu.se/Shibboleth.sso/Login"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">IT-avdelningens Wiki</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">IT Department Wiki</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">IT Division Wiki</mdui:DisplayName>
<mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki</mdui:Description>
- <mdui:Description xml:lang="en">The internal Wiki for the IT Department at Uppsala University</mdui:Description>
+ <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -41,8 +41,28 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.its.uu.se/Shibboleth.sso/SLO/POST"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
</md:SPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+ <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+ <TelephoneNumber>+46184714400</TelephoneNumber>
+ </ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..fd6f906c
--- /dev/null
+++ b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki2.its.uu.se/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://wiki2.its.uu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki (RESERV)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">IT Division Wiki (BACKUP)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki (RESERV)</mdui:Description>
+ <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University (BACKUP)</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
+ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
+lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
+VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
+MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
+xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
+KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
+HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
+WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
+T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
+TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
+d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
+XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
+oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ </md:SPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+ <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+ <TelephoneNumber>+46184714400</TelephoneNumber>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..a1578586
--- /dev/null
+++ b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wikiu.its.uu.se/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://wikiu.its.uu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki (TEST)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">IT Division Wiki (TEST)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki (TEST)</mdui:Description>
+ <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University (TEST)</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
+ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
+lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
+VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
+MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
+xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
+KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
+HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
+WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
+T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
+TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
+d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
+XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
+oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikiu.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ </md:SPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+ <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <Company>Uppsala universitet</Company>
+ <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+ <TelephoneNumber>+46184714400</TelephoneNumber>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 830143f3..5d96937b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -432,6 +432,7 @@
<xi:include href="swamid-2.0/comanage.sunet.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/comanage-test.sunet.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-sp.xml"/>
<xi:include href="swamid-2.0/registry-test.swamid.se-saml2-metadata.xml"/>
<xi:include href="swamid-2.0/test.play.rkh.se.xml"/>
<xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
@@ -610,4 +611,13 @@
<xi:include href="swamid-2.0/test-portfolio.bmc.lu.se-mahara.xml"/>
<xi:include href="swamid-2.0/lunduniversity.bridgeapp.com.xml"/>
<xi:include href="swamid-2.0/exitpoll.jbtst.srv.lu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml"/>
+ <xi:include href="swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml"/>
+ <xi:include href="swamid-2.0/sunet.instructure.com-saml2.xml"/>
+ <xi:include href="swamid-2.0/kau.instructure.com-saml2.xml"/>
+ <xi:include href="swamid-2.0/test.valda.uhr.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/fs.vemendo.net-adfs-services-trust.xml"/>
+ <xi:include href="swamid-2.0/wikiu.its.uu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 85062901..199056c7 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -24,7 +24,6 @@
<xi:include href="swamid-2.0/test-his.hr.evry.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/test-mah.hr.evry.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/int.mp.uu.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/akkatest-anv.its.uu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/t0253.srv.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/emmautv.ldc.lu.se-shibboleth.xml"/>
@@ -40,4 +39,23 @@
<xi:include href="swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/konto-test.test.hb.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/fidus-test.skolverket.se-sp.xml"/>
+ <xi:include href="swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-06.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-06.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-07.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-07.its.umu.se-student-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-08.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-08.its.umu.se-student-sp.xml"/>
</EntitiesDescriptor>