summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-2.0/account-utv.hh.se-shibboleth.xml118
-rw-r--r--swamid-2.0/account.mdh.se-shibboleth.xml103
-rw-r--r--swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml14
-rw-r--r--swamid-2.0/hkrplay.hkr.se.xml7
-rw-r--r--swamid-2.0/idp.chalmers.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/idp.mah.se-idp-shibboleth.xml4
-rw-r--r--swamid-2.0/kauplay.kau.se.xml7
-rw-r--r--swamid-2.0/mdh.hr.evry.se-shibboleth.xml81
-rw-r--r--swamid-2.0/meta.eduroam.se.xml95
-rw-r--r--swamid-2.0/meta2.eduroam.se.xml44
-rw-r--r--swamid-2.0/play.gih.se.xml7
-rw-r--r--swamid-2.0/play.ju.se.xml7
-rw-r--r--swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml7
-rw-r--r--swamid-2.0/play.oru.se.xml51
-rw-r--r--swamid-2.0/redcap.ki.se-shibboleth.xml31
-rw-r--r--swamid-2.0/redcap.tst.ki.se-shibboleth.xml29
-rw-r--r--swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml197
-rw-r--r--swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml184
-rw-r--r--swamid-2.0/sts.mah.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/sts.mau.se-adfs-services-trust.xml95
-rw-r--r--swamid-2.0/stslab.mah.se-adfs-services-trust.xml9
-rw-r--r--swamid-2.0/video.su.se.xml7
-rw-r--r--swamid-edugain-idp-1.0.mxml1
-rw-r--r--swamid-sp-2.0.mxml5
-rw-r--r--swamid-testing-idp-1.0.mxml1
25 files changed, 507 insertions, 605 deletions
diff --git a/swamid-2.0/account-utv.hh.se-shibboleth.xml b/swamid-2.0/account-utv.hh.se-shibboleth.xml
index bbcb342f..a14e617e 100644
--- a/swamid-2.0/account-utv.hh.se-shibboleth.xml
+++ b/swamid-2.0/account-utv.hh.se-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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://account-utv.hh.se/Shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-20T14:10:15Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
<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"/>
@@ -20,8 +17,11 @@
<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"/>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-20T14:10:15Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
<mdattr:EntityAttributes>
- <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
@@ -30,45 +30,86 @@
<md:Extensions>
<init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account-utv.hh.se/Shibboleth.sso/Login"/>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Högskolan i Halmstad developer site for user account activation and password reset</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad utvecklingsmiljö för kontoaktivering och lösenordsåterställning</mdui:DisplayName>
<mdui:Description xml:lang="en">This service is only used for testing</mdui:Description>
<mdui:Description xml:lang="sv">Denna tänst används endast för test och utveckling</mdui:Description>
- <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
- <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">Högskolan i Halmstad developer site for user account activation and password reset</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad utvecklingsmiljö för kontoaktivering och lösenordsåterställning</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">https://account-utv.hh.se</mdui:InformationURL>
<mdui:InformationURL xml:lang="sv">https://account-utv.hh.se</mdui:InformationURL>
+ <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="en">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="sv">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:KeyName>account-utv.hh.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUZxEzKJ3kDq/GvtQh1pmSBA5GAo0wDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwHhcNMjIxMDI3MTMzMjE3
+WhcNMzIxMDI0MTMzMjE3WjAcMRowGAYDVQQDExFhY2NvdW50LXV0di5oaC5zZTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANOV6xBmYlBQ95kxBjYL4EQk
+4IYGr6948hKp9Oq9wygefSkUs/S2KAMVTlr1/cK9IWDN5zbsKSb9JwGg6ySaqs9J
+Ff0B1GVvrQDaNK5haWB3Ihz2jBF7rD+TW5jOK/lYwfbkTJXLb+NWrro9HEIByG7v
+5tz5hkGc7k0TPXp/1vG19lxTbexS45NLtD4NUTS2j3++HE9zM1YHHvTLX8TGUnDT
+gCjcWDQoewud037D0I9IkdYtGcgmOU9dNH1jxCmcJNFeg/4poc1UxqVJUZUS92qR
++BcdPoBrCYHqoXLidEYLYLxZALIMpqX34y/msLv7kDvWZRmMpCupM4PvK3uAV0VR
+f5APMAjbUsH95izClmwbEvTkx1XQXG4YgF6kgdbOOO6UIfvF6Z3XAWyRRnsAd3tt
+3uTyNx1vm/Ex1g5lhbeH+cxxFkrCKMDLwa8ajlvWBM5cNWHKEOh75LfvzZVJAeNp
+4+eaF3AmO2qc8eefj9vFXsROolgmtbNnSQs7vGOYyyjNGtlcQslVgR9oEr/hyZIz
+hvQE+O9x+Qc/bzCLBK2E3GZaIinydVU97KP3PNE2Kvxa3CIhqdA6inBzOb4W6vGG
+uStQakuue9rtSDP9hgssFKFtCBgcS/9pDXB/GbXefZERHnnTtwf82PKEr0hBKWGW
+PCk19HWpy0g6m9BjB06nAgMBAAGjPzA9MBwGA1UdEQQVMBOCEWFjY291bnQtdXR2
+LmhoLnNlMB0GA1UdDgQWBBRBDdOyoQyT/+w7ApUhbFsxQeXHJDANBgkqhkiG9w0B
+AQsFAAOCAgEAHQAAtgoCGqPv2z15F+TB/4u7tvz65eFb06YN8RmckiWb77fHG0JT
+/FCr51Zr3EDVUU3DCe7KLvKRUG0WReC4ANYw4f/L0pJ25841Uwm41tOwB7ek8Qps
+X34rUsPdxmLjbXBHvNio9KobAqz/ENs80boFon73wuKa36rl3wrTGWrLYDG4+VOm
+2FH6bdsME30hDLsemOxBvslOZehGheRQwCFSBwK5rTD7/BEEDZtXWPn1TmFg2CAX
+/+nn+P4wd8t1uneK3AxpBu+11iZS6u40IMTHinco3KHQkYPFRC7C1GCofju2iLkt
+OjWpbWovR8PMifUwbjU2rLYDgCUfU94F70U3IvsSBQNzNbesvzv8Dy9e5vD4kkhg
+jZr4j0blZqP0OAuvLVGpTU0QRqxkd8wcmWijMuVl42TKP1td174M3UJ1bXjpBv9S
+qhfDdOqcdxVldx0U54sWk4reOQTMVFX0viBPvCe4Fl0XgMyHVCEEkId6p3B13BdN
+eXvM3fJjAPLBXN5N+wr2L/o/0gsTZLQNIXVLNXigZyQvTMKveC1TUyInanksWI2e
+ufL+FCkZsl14GWuv5SJB9QA1wuIuLrSEGOEUD0KZgUETvEWaJOmKHdQ9gt64KqsX
+32LlH8M6eDC+/v568zngqcX6YxTxE8kqtakFNVyKtZrh7XZEsQ5T8nw=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
<ds:KeyInfo>
<ds:KeyName>account-utv.hh.se</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
- <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJANeDUAW7mkq6MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEWFjY291bnQtdXR2LmhoLnNlMB4XDTE3MDEyMDEwMjczMloXDTI3MDExODEw
-MjczMlowHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDDNTNrQauTXZtp1RF0JsuzgRodAw977xgAErnM
-gSUUq/9wekajDi+wnYOt5xnyIrUg0S+Ehak1y6mLXeX4onw5W/KYc8PFpxLEaW2b
-HHGeGOaGPrF1iOcscXLjjCqS+rrTr32u+nTNtDGzS5xUee9vCulfb9QKJQWo3HIS
-aQBIEWEEgkbv1/Rl2RK4uAgBJGtTuEuyBNa1jgIfiHMy65i+b5LdCdazHmit7Rl6
-D6dlukIzEnjU7zmXc+AIpDKys/ApRttsNqkxFnv1DrlT5yTtM3OylJPVUxp9aswo
-9BEsTGr56+G/tzx2ckppPOmMuejZAYUtOyPky5EtegnHbM6cFBXSwW7gEUAOrDzF
-DmYfhIXYhluIYNIz8m+YyH1BQM5uspwsp5/STLO/EXPUR2YXsRJ9GfxzNQzRZS7y
-cfJonZokszL8dCzW4STTc/oXZRQh15xHaDxQvSz2fKPafzl11W40CGg8DstwUWTP
-CUyILzK66LEVkm1WN6xT24wBxmkCAwEAAaM/MD0wHAYDVR0RBBUwE4IRYWNjb3Vu
-dC11dHYuaGguc2UwHQYDVR0OBBYEFGsykFo6cqgQqcTizoc9F8nDQJEYMA0GCSqG
-SIb3DQEBCwUAA4IBgQBvN9hNHMRUEN05D2Lj73dHVMdPJ0W9pgVsNSyyKxfd6vLT
-XoYEytona/BfkilJxelX/fwu+PcJDDGZFXdy9DMYtiUtOzm8MHSHcFKbtHCTl9kD
-MjHXicgQOTYbWWjz7AcZsivER281IM3TlwrAj+sW8HB9Ro3K633GkFTnkworclc/
-1GR07I+UlaXKBaaYSBGHi7fcfSSunKzJF2YH3+WW2j+cRkpx8/TBLsoFgjXmdgrL
-pG3P3MD75ssjfCvbEFWYplVGUeaAFR2aW4DSvRGqkGQvO3CeSsZNV1aHUh+x3Yz0
-sZgJsQSoaSa4xk/vKojuR0FYYomLKehkgrQ7IG5pN+sBhZ08suLY5VZA5lFLsQTk
-wrE5E8PkirNAGewN2PENm+PgEOUuZ6nHCBZWPiBppFoDqmpN5RBgaVUtt3Y7bCoi
-SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
-4LCnJTXEDEPlvaLqHsE=
+ <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUHLqGIcHWmsjVx4LKZubkaABabe0wDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwHhcNMjIxMDI3MTMzMjAx
+WhcNMzIxMDI0MTMzMjAxWjAcMRowGAYDVQQDExFhY2NvdW50LXV0di5oaC5zZTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANOVF6A2E2t/fwTYtYDQsvx5
+FWnM0uxO34zTLw6g5oWiYX2vAh3BrhzWbgaDvqG947qWFr0YFntQ4Q6Y5g5ffLS+
+dheJ7UTyZoM0Ix5dKasp8+fDO3I73Gc6Y+AvoBRT7UkUuCosXmeIZSdgcalZiwFz
+bCmdi85xcePRJY67NhMuWkKC6kLWQoP5JOnUulfbZKai4VT9LZIzJ0zwuDqtKNlm
+Qj2wFWF8fKf9cw2AMQ5CUlhgcB1y7WcBa0t0/sSR10g6zMNp3AXcSHoBpaGariT4
+d+tH6TEmljKQ8CGpYwAnAmfy8UzbpiOFFhfoyZvxb0VpKXDEUz+PkTRjQkYrjZ+y
+BqeXw50cp+qyw1yPioL1P0C709m+VnDKTzfJ5sZgO7/BOBoNcTKC+LOErCFV0S5K
+VLJUs7XkuEtfA36zB0VNrHXIjJUgSt1zuD0/YdV2kTn6ZtKhfL7JVyEqIg7zNe8v
+X5EMGeomcAN8+Jr3Gqx79j/tvn8sgxKgpvBN7Ujry1R32kUSXDOuxOZq0bMvaa9z
+zwS131ubkyLcLzYMBTi77WsTNFVut2EOyvdjSJ+XDwHDR6SRpnvENFyFytm8sFIk
+TqnSQV9iS2reMpho+P0q9x4mpGfQcBb3nX8YYioFaepPLVba4HedjxrKD82vUeio
+jhUH9HKZvSDme5Hvn5mTAgMBAAGjPzA9MBwGA1UdEQQVMBOCEWFjY291bnQtdXR2
+LmhoLnNlMB0GA1UdDgQWBBQ0J4Z/i1TA9AAQFH1V48Sy8ZXCizANBgkqhkiG9w0B
+AQsFAAOCAgEATUTRs4z1qxbJRBlN25HzUqRXqlK+EqwpqcllBth6l3bAUVeL0gGi
+Mwthi57ROdHDIHRLVkp/gEh58MdsnZF9UC0ZhUlg+FgZvL6H5b283NKZlNPUFqmb
+jbfTu3dloRWb7IbGvjZ2d3k52tXDZuZNm1zxw+STUVVnckyVRBAY++jMLp2cwUQV
+JntMGIzzhepz2xKN4jqib89n7EFLTI1K19xbLqt8l2LegfSk0jGyxq5G9SmyUMQ1
+Q+oYaFAEnSE/LccRQaLKQX0RUAUY7MyWjSz9FYYMmk0Uv1W9bOyiPJsmiT0roVGo
+f+hFxe+pPV0On3iPAy2L7CvC4fdog7X3Ub2ywBTi1NHeIBn/Sr46RY7zCcGU1/GU
+Bgf+pYzJOuk8+8XNmYcaAbgZ7JWW0OwBM/ngfKq2jGDT0iKtMi5+nmkbfg+BxSUz
+qZNs5gPd5P9xYo7d3bLV8T4WZUTs7bIJyNtngm5zdLl7XiPG7aySB4Q6IgqCACxi
+mIjZa7CCKUcoMdMT2l5jbcTvAkj5mXZV5xdHI19Km8RN6MksuqK4xxcI/6U2SSE7
+KYbuezOxT/WF+lZh1ovkpUXpnFdYzWq08YI8In+sdQ0edoOhrJfPaXtBQBuK/sOH
+2ROYpYPv8z27QGDrjR4uZAltn+aiDzdiwv4T43ZkwafCYBh8ilQVNjE=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -87,11 +128,8 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/POST"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AttributeConsumingService index="1">
@@ -101,11 +139,11 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">HH</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="sv">Halmstad university</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Halmstad university</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">https://www.hh.se</md:OrganizationURL>
+ <md:OrganizationName xml:lang="en">Halmstad University</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Högskolan i Halmstad</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://www.hh.se/english.html</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
diff --git a/swamid-2.0/account.mdh.se-shibboleth.xml b/swamid-2.0/account.mdh.se-shibboleth.xml
deleted file mode 100644
index f0c06e94..00000000
--- a/swamid-2.0/account.mdh.se-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://account.mdh.se/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-14T10:29:19Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes>
- <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://account.mdh.se/Shibboleth.sso/DS" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Account activation Mälardalen University</mdui:DisplayName>
- <mdui:Description xml:lang="en">Account activation service for Mälardalen University</mdui:Description>
- <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Mälardalens universitet</mdui:Description>
- <mdui:DisplayName xml:lang="sv">Kontoaktivering Mälardalens universitet</mdui:DisplayName>
- <mdui:Logo xml:lang="sv" height="130" width="216">https://idp.mdh.se/idp/images/mdulogo-sv.png</mdui:Logo>
- <mdui:Logo xml:lang="en" height="138" width="216">https://idp.mdh.se/idp/images/mdulogo-en.png</mdui:Logo>
- <mdui:InformationURL xml:lang="sv">https://www.mdu.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://www.mdu.se</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://account.mdh.se/privacypolicy/</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="sv">https://account.mdh.se/privacypolicy/</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIJAPaKAClrLbTPMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmFjY291bnQubWRoLnNlMB4XDTEyMTIwNDE0MjgxNloXDTIyMTIwMjE0Mjgx
-NlowGTEXMBUGA1UEAxMOYWNjb3VudC5tZGguc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDnDT2AU69L2h1ZQ6iEVWhGtQYC78dkJBcJ8XjDHImC8BEC
-wxJVg2SNwzT4pb8tBT0PpAXHRbTdsg7Isxa6Ah13OBWN4pEuj1+gweijXwie6BGn
-AL2WMeVIDYkA31tNcy5h2qqfhyHFTeFBhoVfwjL38kXb5eZ8z3so6HKX7CRyg3w8
-i8Wvisey073edn6ojH+k/6hjOCU2Yw7Gi9nfgZF5fAIh50djp52Ygvfer5QuNvow
-S0V2vZlvU4Le9SkJhMZZyJa7xcbXCte3d7ZzkqW20H/8b9OxZq72HrJILodJkmzp
-NSsn2xesDp5eVb5U0uSDf5Ecw3I/xH57Q6AI0qRfAgMBAAGjXzBdMDwGA1UdEQQ1
-MDOCDmFjY291bnQubWRoLnNlhiFodHRwczovL2FjY291bnQubWRoLnNlL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFAX+Mwdh0P9/9UldxwhrauU/EvDpMA0GCSqGSIb3DQEB
-BQUAA4IBAQDON1n9lbL4S1b+aPR6pegQxpF1Kcw0NnmKp9tECubXVCSJw8V+1lLt
-xSRdF8i5PNALSwxahOYndivb1bY23dPZ1oKIbR9yGrcAY9aSRzt4l2Yh7k73LBgI
-0OHsbLLKxiReYWvMR5+QseIN3FpgBeAUJmOPQL79FcYxQl+nX4DgBatb/aYYOU0S
-nLhAo0q9al1Is1QdxLo5FyHaYR/Xu+p31ltowAg4NQ29zRHfW7BQG2JmBEXrxIB2
-zpHIUu/5SWS3wMnuRZgdr25OF2r+/mwgyOrAJ69Zi1ajEIA7YhGwVZ5V5FF4UgPe
-Ty6ceQwd7bOvvrpf5YqChJKmoxF3bTiK
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account.mdh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.mdh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.mdh.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.mdh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">Account activation Mälardalen University</md:ServiceName>
- <md:ServiceName xml:lang="sv">Kontoaktivering Mälardalens universitet</md:ServiceName>
- <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">MDU</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">MDU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Mälardalens universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">https:///www.mdu.se</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">https://www.mdu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:Company>Mälardalen University</md:Company>
- <md:GivenName>Peter</md:GivenName>
- <md:SurName>Falck</md:SurName>
- <md:EmailAddress>mailto:peter.falck@mdu.se</md:EmailAddress>
- <md:TelephoneNumber>+4621101499</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:Company>Mälardalen University</md:Company>
- <md:GivenName>Peter</md:GivenName>
- <md:SurName>Falck</md:SurName>
- <md:EmailAddress>mailto:peter.falck@mdu.se</md:EmailAddress>
- <md:TelephoneNumber>+4621101499</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:Company>Mälardalen University</md:Company>
- <md:GivenName>MDU</md:GivenName>
- <md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
- <md:TelephoneNumber>+4616155150</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
- <md:Company>Mälardalen University</md:Company>
- <md:GivenName>Peter</md:GivenName>
- <md:SurName>Falck</md:SurName>
- <md:EmailAddress>mailto:peter.falck@mdu.se</md:EmailAddress>
- <md:TelephoneNumber>+4621101499</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index c48aa7d7..f254ccfa 100644
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -61,10 +61,10 @@
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">CHALMERSTest</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CHALMERSTest</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Chalmers Test IdP</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Chalmers Test IdP</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola Aktiebolag</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.chalmers.se/en</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">http://www.chalmers.se</md:OrganizationURL>
</md:Organization>
@@ -85,4 +85,10 @@
<md:GivenName>Servicedesk</md:GivenName>
<md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:Company>Chalmers</md:Company>
+ <md:GivenName>Chalmers Incident Response Team</md:GivenName>
+ <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/hkrplay.hkr.se.xml b/swamid-2.0/hkrplay.hkr.se.xml
index 9fcf80f9..ffe7c7c9 100644
--- a/swamid-2.0/hkrplay.hkr.se.xml
+++ b/swamid-2.0/hkrplay.hkr.se.xml
@@ -24,6 +24,13 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
+ <ds:X509Certificate>MIIE3TCCAsWgAwIBAgIUeuPWbZyaIL38OmzMUe8hKR+0TyswDQYJKoZIhvcNAQELBQAwGTEXMBUGA1UEAwwOaGtycGxheS5oa3Iuc2UwHhcNMjIxMDI4MDUzNDU5WhcNMzIwNzI3MDUzNDU5WjAZMRcwFQYDVQQDDA5oa3JwbGF5Lmhrci5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOsPkxlmoYqgS5t7onW4GSx0eWgdlMtfuSoC9zdpF9lBThyCsEcWP+nvFiB0jPiDc0viz19x05rDqqGQQBSyDF1G6SgAJ+LJn7mUibktRSJenwZX7HpKqx0ApwuuoGIKn4luL2ZAaaDYR8n/yEtRY1P7BvCtIiR6/tdiFVwt6ua2yY0/iI2m8BGin6OZ4WRfiEHC5a4M5CYUtC3Ti/FPH9B0sCcbHzhwKqS/skuiLdsCb+5sTVfMUZCZ52CTtxqL5sA5Ok4ILEPQfX5TuJKtAvFe7NrouWIqMfCOdEUuAczIteM5yMumw03RsRW+AInqT/5sGPk8NGSbRdwDL0oEgZWTNVLrFTceOBJrsFZejvYUEK5w6bBdSDtsL03NrtIKamjyp86I7PCJFpCq64eI3HKCkCiOr4qUpu0Y16DQ9GJkaTJLt9pRG99NQ2qXryufZgMBiPBpwy8P6/NBz45PKstoMZhHDMnJFty3n39UdDuDu2ss82bCBs53aCcjFTjxapvwRqetgnOz1rR4DVaORHw9TJPpOEAjxIu6B/jqEb58JwL7kgpeCqapBwcow5pHoTSGQml/uDM+adUsxbbyWpJ/7FQi/IktAWiQwEg/juRW93c4DRkxHSEMjOI41Yrv1ql4UDfO43kBIFN3p+Lqr/Y5GrLt5qeBOsC0fScEPW7JAgMBAAGjHTAbMBkGA1UdEQQSMBCCDmhrcnBsYXkuaGtyLnNlMA0GCSqGSIb3DQEBCwUAA4ICAQAFptY63bgxDR9JG+y6+ajhVrCRIYTOeN4IexGBRfUCjMTCixorustcWiakLYEmlKdNm/WPefeA0FAgJx2GRbou005vgbI7lmnwAMum0J9G83ipHQrDfukv8xpV/B/E+Sd0nils7lJkZ334z0nieJozlGfa+DTwNRqQWMKMdGpzC5nrMehC5mllYBarI2nBC6AFmsd6gi3SL6nD1XGR1YQAKPE+b01uvkUTnKqpSojwd7KUskzHB7LKp6ZvkcFTwPjKiDtkUjUXdeH9pORSDIXatNKdLEHinQYBWPEz29ZERqihGM+HnEmPaHz9JBhKH0u3F5f6MemUbB0Mg6VnV5SD6IZ7gidy0Qq1y3e5EXSsNPpWtZ5e+5Rhe8xMq4cP5YtzGuRiepL6jPvUI63U7m9n/WV96103e/aM+iiQmBDXXbZR0Uu6u5wO1BRzuid0BIWoPRkmOdrQo43Ty1VXNiEArMGTB61GPhQ4gmg5iL41OzrqKiFMoBfizuZHnRf0s/55NI8wF6JtVLXGwpmT32eOSfyICni70amJ625H4akLkg6NfTef29uXhuopa2dzAwWMIcDAikBVxc3s09VKYAxl4BUuEJq7KpmyIntq83lmPpw1Y5O3dSJ4e/Sv+6VTcwORfhueE/9QQz3lSWThO/wdMJjY+kkTsHoNVk3D69VhUA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
<ds:X509Certificate>MIIB/DCCAWWgAwIBAgIUR0NIYWpM9T6CEGjdts8Bh/BZf6kwDQYJKoZIhvcNAQEFBQAwKzEXMBUGA1UEAwwOaGtycGxheS5oa3Iuc2UxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjE0MDkwNjUxWhcNMTkwNjE0MDkwNjUxWjArMRcwFQYDVQQDDA5oa3JwbGF5Lmhrci5zZTEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2p2uj2tNIz/5TXvrs2ZNtsioLYhWtKs2sTMeOO+Zv0c0BBqVkoCGhBB2afbhIYB9ER+JHOwtQeHujCGa/RRvCbOi6n6gj9ZYaJoo5co8I0EkwVx09aaDVo+qxc2AUitPtNEeG7BvN5BSudlCiCQESu4hkNdUH+LSnMlDlsBkJWkCAwEAAaMdMBswGQYDVR0RBBIwEIIOaGtycGxheS5oa3Iuc2UwDQYJKoZIhvcNAQEFBQADgYEAKdQn8AwPrN0ne1OSQH/d1YjCLKq/8Tb+1eMFJQSOOGIYCaeEw3yDngzQbUkfpQkU3XPac+aOW1GZiXy6eOob0h9J5HK5aDDXWtAadT+KBPOXdTc1fRVdDUV7gQkNIVg4Me8gBm7krR7XQmNasMXgP4bpFlTHL1CMMJRZcGIgTNM=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
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 fab5025c..16f00c0f 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -65,8 +65,8 @@
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Chalmers</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Chalmers</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola Aktiebolag</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.chalmers.se/en</md:OrganizationURL>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 17faae51..83f9c291 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -28,8 +28,8 @@
<mdui:DisplayName xml:lang="en">Malmö University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för Malmö universitet</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for Malmö University</mdui:Description>
- <mdui:InformationURL xml:lang="sv">https://www.mau.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://www.mau.se/en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
<mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
<mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
<mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
diff --git a/swamid-2.0/kauplay.kau.se.xml b/swamid-2.0/kauplay.kau.se.xml
index 4d2696a7..f5039b5f 100644
--- a/swamid-2.0/kauplay.kau.se.xml
+++ b/swamid-2.0/kauplay.kau.se.xml
@@ -23,6 +23,13 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
+ <ds:X509Certificate>MIIE3TCCAsWgAwIBAgIUPOQTYTWiJ8sU5BDRh8yBroax7GwwDQYJKoZIhvcNAQELBQAwGTEXMBUGA1UEAwwOa2F1cGxheS5rYXUuc2UwHhcNMjIxMDI4MDU0MzMzWhcNMzIwNzI3MDU0MzMzWjAZMRcwFQYDVQQDDA5rYXVwbGF5LmthdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMSLJ7l6nvc4vuajxHtPe5Bp0/dBP1IHFKnZ+Yhxiw7hsz6EUUXLqQWSNoAZQ0b4J1igTvNB3vHRjxmX3Pn3D1Ta5zhoIJ1D1RGtds7G+VOJU7httrl9FnfrPQ/RAvIGJDu3jcA0uAjxZOat5qDOQ9VTwoddFmr87KLW2fKqhmxaC1w/bFb3w/vs8PouGCKcyNO7fWqZ56C2B+vLw5cXt0bB8wnhch8gmIsw58gKXMLdO9DuFlpl+/ijcYR9gtAsyvY6aZy5kkg1nvSmfbSuLSlLboWaZJY9dntb8XZziGjCO19hAz4QflkVigOFtb9KHdc/YK3UL87sxfa1545E5yTJb6N9xFvHSNYK/9QR47schtdF2F53nm31D8qsVmjYdUDpLx7JYIaBJ50nNB7XFUgaFnaymJez1d0QfTkvg92mhkKlpdy6FZ5EMcg0Hn4gqMex+TJMke+ApVikg4uZ9RNOsi2Yw70a8URO7o3ji29M2lPHTEnRWkfOKGXiMsTfZcFznn7TQsKNf77aL0bUmEiirSCHjWgBofYy6bImsukCd1HpD+zqIEYlsbmYiGOrPNt4hUQlyOfBHvCxUHZEe5KA+EGtNn0wexaiVKOcwhmfUGabLCwtDLHZwayWOEPHl0FQtB291wZ0iQEygRJ3MFLc1WY5wKBTfPi7jB2bktBdAgMBAAGjHTAbMBkGA1UdEQQSMBCCDmthdXBsYXkua2F1LnNlMA0GCSqGSIb3DQEBCwUAA4ICAQCEdQTqudWy2RL38XpBiF07YZdsx52ALB8kaeRuERQ9OCG+Z1rtWhkzB+b5CDsOY9x0wxjFq1uf0Z5ufAFuKviBTvYsEVjrCGPhJOCtPuSByodV6tf7o9Fzj4AiY3bQFgujA1j8898CZgWJzwwAW5Eg1qv0UQYSxUzEly6Hk6qL/X2c2jyyrsZCGkmERsx3FXm1iIUIHrRPvJgo4aWpiyJigdiUzZJaY+c9U+XQ6wyWBV4J36TI0qh/zEZvjmd1o17+xDOE43CiS8Gn8bz5CI1WrudtF8YMahecWKbQn4KMdN2bHLYf/T7jRO93Fl4XlBu5qjpHDwnOKs9dgiszx1HP7k+pJvTlU8lku+2var1qBN2W+5P6z5i3gXRdFyKhS55XGFvljhIz0U3In5lZuNt64tWDJRqBDXTh1NGfjyNMSY2FPTjtjVitz+ocdRbLoq2QHKo3FCmUKrBPuGwAL//wQAOwTzh6XVysi2ANGUY8eKXOoSsf5XoHO5anZhZ9jpIfO8e1e492fo9cG5hJDmh+JDJW8NarU4X+FFnxvHq8spzWB2Ldi2ZYrDoBWB2/g0JPo2iFZwjRPd+T19UfosgPv72RQv+z0ciGNNL0jmEolNo4DLU38R5SsFGl4/Yx/nWFOet7ODRmqFbr63F55YT/HoszKT+wYepTxZpXfRWDew==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
<ds:X509Certificate>MIICMjCCAZugAwIBAgIUJthSm5mO42eUMlr5toLKJCLgBMowDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzAwLW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNDIwMTE1NTE1WhcNMTkwNDIwMTE1NTE1WjA9MSkwJwYDVQQDDCAzMDAtbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyiDNnoLi56KGDLRoJ0Y2dBj4G7++BtnhkBGqIB0AwF9O0hNgB5smGf6biR+D+qjhrux4tGLM3NBgeevoCBhb5aupP4/0MBeelhdDmoPfApYRVIXp0N0rSy0gVFRtr0sw9T0txuBq3jB/XzVHRmWA8dSm9H0kkoZEzWRViGWroPcCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzAwLW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEALwp3i9iN8738mOgmVLI6L/Q9CwtHpJ8HxPENk02v2gjOS5G81kkyjNT6cN5N5FXaLO/X3XmYMx/k3XWZuInvYHfWnGXb2geWycE1P/n150H4j7pq4RNKmoI0D2vlgdngcqjul/2iWjbUdEhOM3eZHbEdQA0Vwbk/PGV8mAuQfbI=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/mdh.hr.evry.se-shibboleth.xml b/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
deleted file mode 100644
index 13d14a97..00000000
--- a/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mdh.hr.evry.se/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-09-20T13:38:44Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Primula</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Primula</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid MDH</mdui:Description>
- <mdui:Description xml:lang="en">The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at MDH</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </md:KeyDescriptor>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdh.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdh.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://mdh.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://mdh.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
- <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
- <md:GivenName>Primula</md:GivenName>
- <md:SurName>Support</md:SurName>
- <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/meta.eduroam.se.xml b/swamid-2.0/meta.eduroam.se.xml
deleted file mode 100644
index 6731a74f..00000000
--- a/swamid-2.0/meta.eduroam.se.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://meta.eduroam.se">
- <md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-24T13:19:12Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <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>
- <samla:Attribute 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>
- <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meta.eduroam.se/Shibboleth.sso/DS/Login"/>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.eduroam.se/Shibboleth.sso/DS/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">eduroam meta</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">eduroam meta</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Detta är Sveriges nya eduroam metadata hanteringsverktyg</mdui:Description>
- <mdui:Description xml:lang="en">This is the new eduroam metadata management system for Sweden</mdui:Description>
- <mdui:Logo xml:lang="sv" height="115" width="50">https://meta.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
- <mdui:Logo xml:lang="en" height="115" width="50">https://meta.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:KeyName>meta.eduroam.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPxbtJJgj8+DMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xNzAzMjQxMTM2MDlaFw0yNzAzMjIxMTM2
-MDlaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJiUJnvTlXFvlPhqHlUvGuTwTKl9lmAeap37RKonVMtB
-gGa+UV4lJ5I4vZqmo1GqBq3/YWwQTTAyQkdE4rZR5fpLYnfe0L/a8IPuVuq4U7YX
-cGj4ArShzOOCEtVRFfqUfZoe0g4YzPVCKpD7M+kYUnCIQYcBwc4aMVcKHGCCJWMG
-gssYjoQ3R4cpDten4++bApaOUqNP8YeWTe24PPSPqUA18ocqPeuONPsynnVUzZaO
-jF30687QTEWi7mLixnCskTxX/d3HzUj6B+X2nUI/7HfOEWTGF00smiGN7Y7UZkIm
-XJfgpYvNUkvmiWEUzUi5ZsGECd7GdeS7mZCeZOI3sUUCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbWV0YS5lZHVyb2FtLnNlMB0GA1UdDgQWBBRI4mYILiY8u0TWHOjSwnSu
-8sBqCjANBgkqhkiG9w0BAQUFAAOCAQEAO/R5fMGks2QvEYGqP8sWZEh8Mcb6+rWr
-m/WqKx4qKLiFHOE5IgDRoozQtzxSC8mroowvQhO1QuX1eb2+kmNxLYdBxWaO/Afu
-4t5PhvbiFbxm5pa3UG+fSEnRIVoANc1aSUFREYqGw76vUxL9AgWHhZj7yk7PwDAr
-qVwd3QyMOJookxU52F2tKfh6Ycvj19U+hZh95R8ItW0PSGNllsxPayIdpt2voZM5
-mReDC+W3lhFUIiep/tdMa2FQmxvBfXpwWP/xxgdNLQHhUAYigMCyWvIeTdMsw5Cd
-n1KiEHawTUUJfngoFN0QtwwvnExeTkUoAOa6ZYr5BscvnB9xKgaDgw==
-</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://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Paul</md:GivenName>
- <md:SurName>Scott</md:SurName>
- <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Anders</md:GivenName>
- <md:SurName>Nilsson</md:SurName>
- <md:EmailAddress>mailto:anders.nilsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/meta2.eduroam.se.xml b/swamid-2.0/meta2.eduroam.se.xml
index b42eb9aa..08aaf799 100644
--- a/swamid-2.0/meta2.eduroam.se.xml
+++ b/swamid-2.0/meta2.eduroam.se.xml
@@ -22,8 +22,8 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdattr:EntityAttributes>
<samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -38,6 +38,10 @@
<mdui:Description xml:lang="en">This is v2.0 of the new eduroam metadata management system for Sweden</mdui:Description>
<mdui:Logo xml:lang="sv" height="115" width="50">https://meta2.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
<mdui:Logo xml:lang="en" height="115" width="50">https://meta2.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://meta2.eduroam.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://meta2.eduroam.se</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/eduroam+Meta+Privacy+Policy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/eduroam+Meta+Privacy+Policy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -88,15 +92,39 @@ GrCXc5ZoCHOTZu74wHNT5vyrZ6BxlA==
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/POST"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta2.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">eduroam v2.0 meta</md:ServiceName>
+ <md:ServiceName xml:lang="sv">eduroam v2.0 meta</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Paul</md:GivenName>
- <md:SurName>Scott</md:SurName>
- <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
+ <md:GivenName>Kristofer</md:GivenName>
+ <md:SurName>H</md:SurName>
+ <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Anders</md:GivenName>
- <md:SurName>Nilsson</md:SurName>
- <md:EmailAddress>mailto:anders.nilsson@umu.se</md:EmailAddress>
+ <md:GivenName>Kristofer</md:GivenName>
+ <md:SurName>H</md:SurName>
+ <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>NOC</md:GivenName>
+ <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>Sunet Security Contact</md:GivenName>
+ <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/play.gih.se.xml b/swamid-2.0/play.gih.se.xml
index 7b584939..987228b0 100644
--- a/swamid-2.0/play.gih.se.xml
+++ b/swamid-2.0/play.gih.se.xml
@@ -17,6 +17,13 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
+ <ds:X509Certificate>MIIE1DCCArygAwIBAgIURUQ885Tnmo6YcfkRLf8Qs1+UiRswDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLcGxheS5naWguc2UwHhcNMjIxMDI4MDU0MjU2WhcNMzIwNzI3MDU0MjU2WjAWMRQwEgYDVQQDDAtwbGF5LmdpaC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALib1HI5P0UbbCqgwjVWvWs+Uoi1dC8YLjBS71+FsjgAZoiAlVrsGaNkIQhIMSzbNb6QzJluZc0Ggo72KneMLPqNBDeQyNG/KH3TCS3QrGdwK25Rn3MNOR4JCWQnu7Z2l9epnhDHCW5T2pIuBAypcUUa5jWwVMyxAlWy+bksDtr+pwK/UPPVzvZCzV01oJ+bZESZHMjpZjHSY3Mm2u+D9Rhw7f4oCzEeUkYv/3wRcOwTIJfN8flF01ZZ3f9ilXKNHFBm3hWW2LIF4SK6ohn3i+43qC1nOOaOjLhS9XcRyCDaPy9Y9OWF+KxxwMlSdPW3ZdRQcqiJh6UsTKHLuBifOLvKOe4EJyA9FsW7C795LGtl8vgC0/MGOp09AZPtDqPXC1BwLNkUcj58TrXVstr8BeBw8RDC6uVDyu75SXtrmeeMUYeobNNg0gqKeWS81cNFpbRIzne3at7KUTvZ0IbGTL9ZtXPi6hVXztunHBfLeDyFtCFpSdKhV1BHA6Fc1eOL9FmNyF03ptc9Dffq8fun9EXFuYmaQUpdRL05rlNrpkhR+6S3qhz3XBezGS/HSl3sJZV3JNHYVO2B/GcCKfcwpZ6kZiDKpbsjIzWCWLgO4E0FY06Ar3uAbo4Ik69/WVdBZYhkmThU+3qCCO4MakeWYTKkd3XF2y88wOdInapV7MAZAgMBAAGjGjAYMBYGA1UdEQQPMA2CC3BsYXkuZ2loLnNlMA0GCSqGSIb3DQEBCwUAA4ICAQCBQ4eObkrpACQpWvc7lry9YIpF6wv9yhY8ZhPREb+JPC9btrK5SwdL0MBDOkIjnQPtYiXHF0rFdb59O0NGX76HYISFS7XgrFZ84zptNSoAIziryPHAEKWwcA1nL6Z6EN1bWi+TgF+dyDeCf5R6zTxS1Sl9JtpXA/ynuoP5SfF/qlhks9gFZnT8yiBa8ihzLvFiYg6vaiceoUMuRcvM4AHVq0jbUAUwqxUm8ESHj/NoP+DXjxe6mHQgPUirgM8ruPDUYzIFiaeHjQAx/EhkMNSTP3vPsxKZQJYAvaywfPV5WXhCRSs0y+Be8p2nfSrhcEVbSx+9cIfT2Z/W/8FYcsApzlEG+zbEHE2Ytf7G7rjvvHSdgvIHkDG0JFVWnZJwsWkRgwCffsVY1Lv6bLk1JP7OPMeYAZJyiwHNMgafDfiVaiQ56+ss80DBDidITxjuqZI6gRLcy8g5p9ooW0X+t+W0/DNYwHR/RqQods/BPoEYNI7lRKen+8M+QS2wYSSTusfzLCQiscfHQ2R5K++HoKy56nEt0xJZrs0wGBlmLES6OzRzjHhdBYSKEBAUDtECL4Y1HrXoZRzpx8UvQxHaochVuRjnNNuqqV8l3/JmlObRDonF7OyHncAYM9s+tZcpHCPsjCVzyyPCmJBPH2Qz9xvls+AmPb/K9OcG8lQ+dmG1ZQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
<ds:X509Certificate>MIIB8zCCAVygAwIBAgIUGO4phjGPXnhpDSe+PKgJYP36m2MwDQYJKoZIhvcNAQEFBQAwKDEUMBIGA1UEAwwLcGxheS5naWguc2UxEDAOBgNVBAoMB2thbHR1cmEwHhcNMjAwMzI4MTMxNjEyWhcNMjEwMzI4MTMxNjEyWjAoMRQwEgYDVQQDDAtwbGF5LmdpaC5zZTEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA277bgBKxoh+dx8BNnVsw8HV3yUPN2lBzCnZ2ZzTIsldqEZnAkW3hW72TvgZe05I7QpqGUvikDWIRYoRXZ4Pe8+AuACGIZtuA2jIYzWy1n/+RpepxJOz/rehZe+EvYeiw4VlQcaEkN7ZIvhF0iV/pgXf0B96duPRD6T+vu++TIVkCAwEAAaMaMBgwFgYDVR0RBA8wDYILcGxheS5naWguc2UwDQYJKoZIhvcNAQEFBQADgYEAxBTHxQVOFVXA32zu0w9KspJzkixyx/hYZX6Av6xpskfTjQmpKmoDDTbP1T+dFb6J+2aV3DrniDfVtsi0ZD/h/Gr5sPKqxHK35p3fR0Bq1D90tyjAHLDGvnA4j+QZkEafiR9DoNKYrvEC1g4fbfSQdKj9Y/Yuu8UURuv8Xromr0A=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/play.ju.se.xml b/swamid-2.0/play.ju.se.xml
index 221c41ac..1265dac4 100644
--- a/swamid-2.0/play.ju.se.xml
+++ b/swamid-2.0/play.ju.se.xml
@@ -24,6 +24,13 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
+ <ds:X509Certificate>MIIE0TCCArmgAwIBAgIUd9dc1c0zWZXQbGq/Zb5bgP2ecRUwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKcGxheS5qdS5zZTAeFw0yMjEwMjgwNTQyMjhaFw0zMjA3MjcwNTQyMjhaMBUxEzARBgNVBAMMCnBsYXkuanUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCooM6E7Io/KTJUCFTn3uC3ummqcWX31EH+1d2ztSa8955hxCfxZqHwDiLvoQNHOEk+ijYG+OoEIatb2p1FeJrGe4kmgIFj25ly064SSWscWVvJLPrQf8BfJ/yim+p26o8/4YjWtkfcQoqCAd11pwyEP8CkRWAuvDbUPXu6AtT2fsKknezQ2zHxNlS1GSt4fgWkIcfzaSz+VKXYAMmZVWpUC6VCF1xacnBG1U2XyotuiJBOQm2sq67f+YD8HOuSBocX8zKSjHFRj/+rEWO1nwwG6Z+ORgGoSNni2RrEMRlcDQe53ujq+8KfANkkeBU8FZqqnIL1g+dBk0PhY+cekRBNL+QwE9s11aowxPl1+pZ/XG6xQd0rkLBoFCmv7wnRMomFxYUi5Q/qyXUlYKJJAWqFXDbP0ql5eRt/sAtWg8kuPmbwRqmKrqGFHfsNrZKmisytjow7MkAG29Mvg5N9JCp2J+P1Qb5Lr8TiNJyoOR5oIt7hTrTxmGPy1bEZAIO2zauMijdLrPTc/sKkxg9Z61kNnz4+6KYDoI6u5aRA/9OG1rdEGQQCJ/0qqbAzI+vCSp2jVKQ7PFI9x8lwy1p8MM5Px5MeOxXmGrBOnjoVKnkJlKEhU/5JLrtWqyRbihLWFcZ2DLHHOZifMhott9taaAQ+lmwwIEimU5oHBB18snfS4QIDAQABoxkwFzAVBgNVHREEDjAMggpwbGF5Lmp1LnNlMA0GCSqGSIb3DQEBCwUAA4ICAQCd25Yh/unodOioQfKNPwa/SJaWVvdx8XRRLyQ8IMpvcf7Cl1CdPbOqTF8sznMjcZcNxctdC0T4jhiXoNgwrv1wQU0D29cXGRSVnzetX4EH+ZRaHtI29/ra9JqFd6Y7I5hn8Rnd6x5GejcGjuThpsHSJAhdk0MHzLwYVZIpyfKeDRSx3CVTdndznt8yQ/IA2OJgc6GlKFZb63ak2s2Uuf7aeWwb7PTJhL4zHw6VWHzPB1xBqE0vj5Jq9VVb2nwSF6tBYfeqxDZannipYXxtCB3O/v45gqWR+3bELuaYcWFv8P/JTFyzotG+H0pcuy76qkUCeOeO0N4EMA+wF/3rUjdADcYvmZW7iYsYFtIWen6BADYgrEg7urYKqCGWOYdEytrWlixVfNyvFKkJYKV596sEP13wXi9qRsDIxinAxOYefgRJwJWb4dl9FoLV4Yw4OUZI78dwr867wMzYs5u2nx8Qdtox+Ei+U3bKqiizhpU+3cDXJB1Ij7Xv8kIscNdqKN2ZZy0KzFoHLxAVmA+77YLBlU/+B1fK3HYQA8Wo8zO67lD2RujcaeGCjGbqa3DnOOCtWCgFQLGhvFazMrbULFrx1lQS8QDOl1b1/z2Z+0xA73fYiLjs82MJVNbWuVHaX/PGAd1Yl4Ohl+whhlXliAduxflGCpnIOybYO21Pw0C9Yw==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
<ds:X509Certificate>MIICMjCCAZugAwIBAgIUNTWT26lK8ZSiQUyTUl0RoiGV4yAwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzI0LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNTI5MTEzMjA1WhcNMTkwNTI5MTEzMjA1WjA9MSkwJwYDVQQDDCAzMjQtbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA25ss28aYBmKyumvI41hpQoQPep9uwhcb9WG0VX6p+nTi7rkk6DvZibfwNCeU4guo0kViuQRLxKbL4R5qmlGdnDrbK2rxdZqXiANu8Oq2EH+3APqHx1c3isv3cbPV0ckQ99IAbtz+sQ7sZe4DB1tRU7he/fdTS/A+z17ud9ZaAUECAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzI0LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAfpxmxPLqbkH8TqyCeBa/Cxp4wipA/W5G2hNG1o3PByooHQDqmM/WTVJVaA+r0TWexfFFF8SiqBoLjmB7/AKr0MyNnAqBga+1dELItmj+NWd6/+8ioYnMcOWFo2mOXSQbis9a4qC2z0ZEGNu3vylTiHWLVJobCwgemrnAguSHEoI=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
index 549ed9f5..720c3c34 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
+++ b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
@@ -26,6 +26,13 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
+ <ds:X509Certificate>MIIE1DCCArygAwIBAgIUXf3YPbrW5sceMZO0BG23KaDlj70wDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLcGxheS5rdGguc2UwHhcNMjIxMDI4MDU0MDI5WhcNMzIwNzI3MDU0MDI5WjAWMRQwEgYDVQQDDAtwbGF5Lmt0aC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJTEy/XfHv/vBioo5DuHMiYmIUMne7v0ACXQubdNGVA53lLxwSnMqDPOomcf00sB/GHEx0QQ4M24Qe+6tKNg8OrHFPfHHvfc8CTe08ib5mReKUTd2IwKZoZh/ZJGGy0rHX+BDjIRj3cZanUFnmrmrZevoPHeaOvdY3oWIBEGv6tBBo9gim+VY+sfjD887TKX50xPn1eLhkbDWvlpFcXlryUzhUgmvQiVF9yNTYRtdeVZ9iOWTA4iIuGR54zs0gV6TEwSvVbZjMdFcMBsje7S99NiyX9+dQTs4iOOcETqaIel1MOPxficDWRs0L1o+bMZNFVzWp7zaHiV2L9wlVz/vXuW2iL0e8UMK2z/ADMi4pytz3q3xXK3jNT9l4HwXXUdZ/ALsVGQhznE5bMkB/HXudz4GPE4YiRUl4ufA5HfExCreZ845zs27smlxMcAlmUkkoXU5YGkJhx/15dpPQoAt+0B6+0Lw2u0yUWg1KqdWEXeeFEG6Hl51B4yOBHsM6zuDVWUSrgO2I5Nm7+p+bJVdSjKhCdwI5fe5UeuRZrzNsP4m0ZOVTgwMR9jh+xSa5jH7Mg19SsplrYYw8hQdqMPdds3SEnN3cTAmt8mHMx32L2Q0630GXoaeegyHaIkLd/9N+4b/sIEXn5yFd/b3Dc3wv9PL+8QgkTiIt2qGuQawOc/AgMBAAGjGjAYMBYGA1UdEQQPMA2CC3BsYXkua3RoLnNlMA0GCSqGSIb3DQEBCwUAA4ICAQBtHL+daZ5FMSV3XnVdsH+RJEQoRthaSPqDkiBWIOrYzizGh50Aw9KLL+RD/wkyfp8eaiFDDvacPhgIRiqS2PmLE7NXROSkTgx9md3XQQkct4YjZ//1XSKLq4e15SVJHmAnnWs2MDbeMbOcyZnY3elnuGA6fW7yN/VQqifwwh7QuFOFB8ub0NGroISH26QkGF0Lsshhani3qCgzN9kuhYKcKjaDOQYWIbJzIeV+AbUr9OeQxFW+oOUK0Exewhe8JRGEBfL2/6DM4oTcrYT1eWWlGpD5M8S87K+K94xmDSZvUOs6K/8EyEwuzeLrASDRTMANcv5Nb46KNCTQTLj93S/39DOh3lmRFb3X2LZsVbZAAN7Ny8yY/IP9mKFZagEhTIisKeZaQuoWeWx6d4KwSMH7EosVA2j+gkfMKXRyN2GHBZwuAwHnATX3Iy1F9XdX7sLGd9oSOESufaK6McaIWcKt9lpRDWqVrykkCQB1jJD6mhSlSbNI2z3HrjOH/bJKurnDPfVVWihUMFUHuALvGIY7pPjRm49LePSCgBA2k90b9oGe28QaQFGOFR9c93qo75oboyGGQmbcbXYmaj+8TsvfAfXiHMyrQXSd4AdSrVmKYhyS7x+UzBbGJR9MqTx3R8QUpXkjKsamC/ONLuFhUZc9uhXZr60PSpJ0vOhGzRDUnQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
<ds:X509Certificate>MIICMjCCAZugAwIBAgIUK69t740SOAHYphfBO0P1aeJe+6kwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwga2FmLWNhbnZhcy0zMDgua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNTE3MDg0NTM1WhcNMTkwNTE3MDg0NTM1WjA9MSkwJwYDVQQDDCBrYWYtY2FudmFzLTMwOC5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtfuzC70VHqp/eu99bfxd06M/kJMSRAYfFk3+QIoOpV0lJbMbiZb4FPlyGCTFJwWlmnh7w+NKg2TR/MDjJ5b1Hyz1fYWK0As0I67h5MZwsIHzSHvcg92OFhuoJwTYIBein3m7+dqsXV0bbywqV9dZKrh1qaomL1F/47zBvwN5lnsCAwEAAaMvMC0wKwYDVR0RBCQwIoIga2FmLWNhbnZhcy0zMDgua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEArniwjrS5Lkjj41dIQ3la9H/cTCyKsPKqV5eD2kHeT+jaMfbA9lxQ/WpJHGYL3ZYhUuervJhMQr+qQmwj6zLyjk8A55E2clIMueQkgD5MshLcwEEHuKCg7/sju+IL17L7+dSgpOlgPvTVLqxrRkWVGpd5C0iP5eY50rdyjUeGXE0=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/play.oru.se.xml b/swamid-2.0/play.oru.se.xml
deleted file mode 100644
index 92d9ebb9..00000000
--- a/swamid-2.0/play.oru.se.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://play.oru.se">
- <md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-01-27T13:23:42Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes>
- <samla:Attribute 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/nren-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">
- <md:Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Oru play</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Oru play</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Detta är Örebro universitets play tjänst</mdui:Description>
- <mdui:Description xml:lang="en">This is Örebro University's streaming service</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIID4zCCAsugAwIBAgIJAIQlX6fPOnNIMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMRowGAYDVQQKExFPcmVicm8gVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5vcnUuc2UwHhcNMTUwMTI2MTAzMzA4WhcNMjUwMTI1MTAzMzA4WjBUMQswCQYDVQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTEaMBgGA1UEChMRT3JlYnJvIFVuaXZlcnNpdHkxFDASBgNVBAMTC3BsYXkub3J1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwZ6XE7zZYgYaSK2rGD3in8rLJ0A2bNAldGBUKfPJSjUrS9TaSD5rlqRcUX5zruOHjui9Nh16wvTLB24urD8H8eJIl0kYezW8H7wIHmamDdbAB+EQCjUVhQ6beSqHxXfpeG1kilBOAZqMWA3oXQ8hp6INK2MQhLkZ9YypUirN3Wz4IKEz6RBfAihPVPwLZtDvEoWvWpHsPCW87OyEwBH4adreOHy4lfHB6gHGKjKjc31f7cliXguwFNSXXcCuBimQi0L6jyZ1IGA9ie1aLqrpdGftQDNdB647RoXBbYh96NnG6Vev1Jzeqh4i3sr0Mw/jAZycAxXhviWZKLyxMQwDFQIDAQABo4G3MIG0MB0GA1UdDgQWBBS/Lvbt0+QFeBt9fP3jqRP5wffvqjCBhAYDVR0jBH0we4AUvy727dPkBXgbfXz946kT+cH376qhWKRWMFQxCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMRowGAYDVQQKExFPcmVicm8gVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5vcnUuc2WCCQCEJV+nzzpzSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBu0Be04H7/GnbAoklB5DLwmeOg/7LcNYZCmz/w2O2f3dBUmEpZQA3csetY2qsKmKAYg7WPQnS1g6xc5joWlT5p+fFKE+i/kXRRZGmHImvRyL86hkgB2YYTaZeRbWwHJ6eYPphEDwLBPhP44ZEtI7rJtZzlEvH2cc0p9Vt0KPglfJS3dhUSTCxYt5X5/RM+cspR9656vqe3oHmZ4B2Aye7PDtz1AQSRLWNrsiFuM5VgBpEGlG8J4HMihiKkxo2/5JCrzkktaX6kwNEQ61V/lv+PkQqWjdA2U66qkfLCJqnLlynKWDyLFg9cw4OsNZb5vparM+kLTAyHtRkNDoFpvcXn</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIID4zCCAsugAwIBAgIJAIQlX6fPOnNIMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMRowGAYDVQQKExFPcmVicm8gVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5vcnUuc2UwHhcNMTUwMTI2MTAzMzA4WhcNMjUwMTI1MTAzMzA4WjBUMQswCQYDVQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTEaMBgGA1UEChMRT3JlYnJvIFVuaXZlcnNpdHkxFDASBgNVBAMTC3BsYXkub3J1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwZ6XE7zZYgYaSK2rGD3in8rLJ0A2bNAldGBUKfPJSjUrS9TaSD5rlqRcUX5zruOHjui9Nh16wvTLB24urD8H8eJIl0kYezW8H7wIHmamDdbAB+EQCjUVhQ6beSqHxXfpeG1kilBOAZqMWA3oXQ8hp6INK2MQhLkZ9YypUirN3Wz4IKEz6RBfAihPVPwLZtDvEoWvWpHsPCW87OyEwBH4adreOHy4lfHB6gHGKjKjc31f7cliXguwFNSXXcCuBimQi0L6jyZ1IGA9ie1aLqrpdGftQDNdB647RoXBbYh96NnG6Vev1Jzeqh4i3sr0Mw/jAZycAxXhviWZKLyxMQwDFQIDAQABo4G3MIG0MB0GA1UdDgQWBBS/Lvbt0+QFeBt9fP3jqRP5wffvqjCBhAYDVR0jBH0we4AUvy727dPkBXgbfXz946kT+cH376qhWKRWMFQxCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMRowGAYDVQQKExFPcmVicm8gVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5vcnUuc2WCCQCEJV+nzzpzSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBu0Be04H7/GnbAoklB5DLwmeOg/7LcNYZCmz/w2O2f3dBUmEpZQA3csetY2qsKmKAYg7WPQnS1g6xc5joWlT5p+fFKE+i/kXRRZGmHImvRyL86hkgB2YYTaZeRbWwHJ6eYPphEDwLBPhP44ZEtI7rJtZzlEvH2cc0p9Vt0KPglfJS3dhUSTCxYt5X5/RM+cspR9656vqe3oHmZ4B2Aye7PDtz1AQSRLWNrsiFuM5VgBpEGlG8J4HMihiKkxo2/5JCrzkktaX6kwNEQ61V/lv+PkQqWjdA2U66qkfLCJqnLlynKWDyLFg9cw4OsNZb5vparM+kLTAyHtRkNDoFpvcXn</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.oru.se/user/logout"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.oru.se/user/authenticate" index="0"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">ORU Play</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">ORU Play</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">https://play.oru.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Administrator</md:SurName>
- <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/redcap.ki.se-shibboleth.xml b/swamid-2.0/redcap.ki.se-shibboleth.xml
index cc0d66b7..4d67bc03 100644
--- a/swamid-2.0/redcap.ki.se-shibboleth.xml
+++ b/swamid-2.0/redcap.ki.se-shibboleth.xml
@@ -21,9 +21,8 @@
<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>
- <samla:Attribute 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 Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -35,6 +34,10 @@
<mdui:DisplayName xml:lang="en">REDCap - Karolinska Institutet</mdui:DisplayName>
<mdui:Description xml:lang="sv">REDCap datainsamlingsverktyg för forskare på Karolinska Institutet</mdui:Description>
<mdui:Description xml:lang="en">REDCap data collection tool for researchers at Karolinska Institutet</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://projectredcap.org/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://projectredcap.org/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://redcap.ki.se/privacypolicy_en.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://redcap.ki.se/privacypolicy_sv.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -90,9 +93,25 @@ DOBgIJcDatI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://redcap.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/POST" index="7"/>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://ki.se/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://ki.se/</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Michal</md:GivenName>
- <md:SurName>Kment</md:SurName>
- <md:EmailAddress>mailto:michal.kment@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>Security Response Team</md:GivenName>
+ <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml b/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
index 2dbd40dd..1a152b5f 100644
--- a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
+++ b/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
@@ -22,8 +22,7 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdattr:EntityAttributes>
<samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -36,6 +35,10 @@
<mdui:DisplayName xml:lang="en">REDCap - Karolinska Institutet (test)</mdui:DisplayName>
<mdui:Description xml:lang="sv">REDCap datainsamlingsverktyg för forskare på Karolinska Institutet</mdui:Description>
<mdui:Description xml:lang="en">REDCap data collection tool for researchers at Karolinska Institutet</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://projectredcap.org/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://projectredcap.org/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://redcap.ki.se/privacypolicy_en.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://redcap.ki.se/privacypolicy_sv.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -86,9 +89,25 @@ Gve8ozn6yxplJyB0jvZae8kfE4LtXr4adWlYG2E=
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.tst.ki.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://ki.se/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://ki.se/</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Michal</md:GivenName>
- <md:SurName>Kment</md:SurName>
- <md:EmailAddress>mailto:michal.kment@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>Security Response Team</md:GivenName>
+ <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
deleted file mode 100644
index e90dad84..00000000
--- a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib-idp-test.oru.se/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-09-06T14:04:41Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-idp-test.oru.se/idp/shibboleth">
- <md:Extensions>
- <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">shib-idp-test.oru.se</mdui:DisplayName>
- <mdui:Description xml:lang="en">Test-IdP för Örebro universitet - Shibboleth IdP v3.2.1</mdui:Description>
- <mdui:Logo xml:lang="en" height="80" width="80">https://shib-idp-test.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUNiSfKA1z7kqPZnZ6BvFj5alpNDgwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
-OTU3WhcNMzYwOTAxMTI0OTU3WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4xgsKQJZUjQQ/2
-w6IMXPyTzSsMlzAyLlb8U5NvskAV9Cy5MlfCn9az4XqR2rm/4FHblwETi2PuMpW1
-qy1DSDA3dL8zWunDuz8J+FhGvSd7xmTnQaOYp5Klqpm2hKUTNUPGPNyCBIOB8iB2
-iKVnTRmThzvr3yOTA0zFrwZZ177DQhkhbP2g/iqBscxYMes7CSNXeFTaI1dksIpi
-3uy2GcNCxDI6khYGC9YT0rcU9eLFQ+gP6hdVZcrPcjPC4J/u6D1YcwC2G7RCNCBp
-up9V0pcCRrcBoo/LJIghfGBat0hKTFUtxK/6GBX1gcrVqTvjBeQXJPqWpzL4qtkT
-/QuYhoMCAwEAAaNvMG0wHQYDVR0OBBYEFBEX0552+o8uctBk5u7x49By+jU8MEwG
-A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
-LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBT
-5WCk9TSGTsQNVvuz7zgqBsTasmc7cI6EjqWyhilonfT2orbnZG5+4zOyJnfYF8W3
-OO84YZSY+XozxZfz1sEaGQheiExJVpMfF7fNKr53jNTw8jcOcgSo4ThOfXSf37q9
-jmfLTiubpqiBpKxWhVvyhZEeDyROCli+3JKfomBO6jVBFs5xeYmuj/LCgavAvdBN
-iZ0aXelhNSJeuPksLkSy2zAWHB9Y+lUYCVZ+0ACFGbtruHUW3L5WSchE5d+KXDZ8
-25H2L/qtUpsi4735GVsBKieHohtT61Un0XKeSwEhWSX+ej5DbgzXH6F7XbMS6+RD
-WVSpbBf+Iky5/3hSJbjO
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAM531TMg36on8Ql5UK2TziTQr9qRMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHNoaWItaWRwLXRlc3Qub3J1LnNlMB4XDTE2MDkwMTEy
-NDk1NloXDTM2MDkwMTEyNDk1NlowHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5v
-cnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmyj1MWgE8NgPY
-tb3XsakHcEOrk6o79EDWTx6DtdTJfz9L2Nl7Z6K/oUZ0R3v1kT8zncS3uz5AlcM0
-vepZ9d4dLWXwKrmOcMTZlRoyQd8RlaC1X3kMinkpivkXduignD/pQter2pCLdoFT
-j0oKbmSHR130zm/uaigcPYjyqwPD/yuwE5mZ+sX1j0NrRU9pvMDZmrgU1XeNwLLD
-wBoCi8qedjGupkJCpvU4X/3+CvVYtzuEImBQmhDnvNpPk1UX6h8wFwNzWr9mkmIl
-qJ9HhakzkbDblsOOgSu+GkGEVaDTFLkoOKxVD8ohqfpYMmNWpCnHvICfbx+qyubx
-Y9qMQUTlAgMBAAGjbzBtMB0GA1UdDgQWBBS6hqhPe57NQMnrUyoK29RDzi4kQDBM
-BgNVHREERTBDghRzaGliLWlkcC10ZXN0Lm9ydS5zZYYraHR0cHM6Ly9zaGliLWlk
-cC10ZXN0Lm9ydS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-Px98VAMrQj/axaEDyVWI+KmXV5JvM5CzJZV2Tt1QZAKG2D1qK/B8Kpri6tFLCK8S
-7cWdzU63gGaP5wONW1rD7uG2bCYlKkiEnJDafapKlS0/qJF2FNA1/6rEDOibwdT6
-yib8RrjklowyQ0pwAMm+YJ89n/MqB5SOL8jPjJEib83FZruRgTg2npKPkc7eWy6l
-XRk4jFV8NbemfAY/9o/JbecRM70stqFI0ihYPg8N7MPyB5Tr5w5OLaqRsEB+qyIy
-AqkS4O7+sMfqyRZz4qH/8s3MKspUmr7LncvBKSWOINun9P2gTJuqqOrJKg7wDHgL
-BAZNocu/Hh/kGS7R/8vneg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUOIOR9/vOXSKitXIAEB1uhk5hRFcwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
-OTU2WhcNMzYwOTAxMTI0OTU2WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVY4Vj+DCdA1Igb
-yz2UPXyniLHv61Q05LvG/1ECyuu79/Qr0B/f8IyKM+S+PiXXm7QlQAmfXWdLRd5e
-LuVUGNjXvBuDava+2yruoHY3Ay5DtmZQ0wpmK8NPRCO647G4dC+viY4lcWZtqIDR
-2mME4w+XBVZYVi3blrG99DqAIxEhN5JPJ1zqas/6JsaoMYvrS4cq5iwe5vubG6oP
-8wR2J8bfRSuLNHlBkhlctzzDsq6TG8gPajsP29nkIp7m6HKTKlsDyf+w/GdnxF+2
-pbOz3/jh/ET0+OB+eL+FO/f3EUF5WH/8pP3SkQRhWqrDeBxEXyFIB0kN6E4RKKBG
-Rhf/5KkCAwEAAaNvMG0wHQYDVR0OBBYEFImydoN/TfZT6En7jgsKNZTGro57MEwG
-A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
-LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAY
-874Wa9Z1g3WnpAOWinjjddVhnJ7B0GLMCasK7ctE74ax4kUcJKWxFjkIcF+6Pqwd
-KwVjBpDVsKGTEG5kb2cVZ1UKcoLo9PWMPuu0vHD4J4nWxciYWaZAgZgmEChRSllg
-afhj274z9wVMQMalKZr6aMw+nqxOxuDMVZFI3eJsDbpnZX7zl8RWwDhd6p+cSG+L
-nqC6xm+7gvxNFRxFh+Rb9I5h4JTSw65XLPfW+Tr3tVwJfWGrwDCLTx5QAC3yPDsZ
-LMTMMpgfHF1hgt28TdVQwk+pE0VqHUjouPIEUhFjaPpMWPiEpTjdyQFv4PDsE6lR
-d3hB7quCN72lcAz/8iZU
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUNiSfKA1z7kqPZnZ6BvFj5alpNDgwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
-OTU3WhcNMzYwOTAxMTI0OTU3WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4xgsKQJZUjQQ/2
-w6IMXPyTzSsMlzAyLlb8U5NvskAV9Cy5MlfCn9az4XqR2rm/4FHblwETi2PuMpW1
-qy1DSDA3dL8zWunDuz8J+FhGvSd7xmTnQaOYp5Klqpm2hKUTNUPGPNyCBIOB8iB2
-iKVnTRmThzvr3yOTA0zFrwZZ177DQhkhbP2g/iqBscxYMes7CSNXeFTaI1dksIpi
-3uy2GcNCxDI6khYGC9YT0rcU9eLFQ+gP6hdVZcrPcjPC4J/u6D1YcwC2G7RCNCBp
-up9V0pcCRrcBoo/LJIghfGBat0hKTFUtxK/6GBX1gcrVqTvjBeQXJPqWpzL4qtkT
-/QuYhoMCAwEAAaNvMG0wHQYDVR0OBBYEFBEX0552+o8uctBk5u7x49By+jU8MEwG
-A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
-LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBT
-5WCk9TSGTsQNVvuz7zgqBsTasmc7cI6EjqWyhilonfT2orbnZG5+4zOyJnfYF8W3
-OO84YZSY+XozxZfz1sEaGQheiExJVpMfF7fNKr53jNTw8jcOcgSo4ThOfXSf37q9
-jmfLTiubpqiBpKxWhVvyhZEeDyROCli+3JKfomBO6jVBFs5xeYmuj/LCgavAvdBN
-iZ0aXelhNSJeuPksLkSy2zAWHB9Y+lUYCVZ+0ACFGbtruHUW3L5WSchE5d+KXDZ8
-25H2L/qtUpsi4735GVsBKieHohtT61Un0XKeSwEhWSX+ej5DbgzXH6F7XbMS6+RD
-WVSpbBf+Iky5/3hSJbjO
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAM531TMg36on8Ql5UK2TziTQr9qRMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHNoaWItaWRwLXRlc3Qub3J1LnNlMB4XDTE2MDkwMTEy
-NDk1NloXDTM2MDkwMTEyNDk1NlowHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5v
-cnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmyj1MWgE8NgPY
-tb3XsakHcEOrk6o79EDWTx6DtdTJfz9L2Nl7Z6K/oUZ0R3v1kT8zncS3uz5AlcM0
-vepZ9d4dLWXwKrmOcMTZlRoyQd8RlaC1X3kMinkpivkXduignD/pQter2pCLdoFT
-j0oKbmSHR130zm/uaigcPYjyqwPD/yuwE5mZ+sX1j0NrRU9pvMDZmrgU1XeNwLLD
-wBoCi8qedjGupkJCpvU4X/3+CvVYtzuEImBQmhDnvNpPk1UX6h8wFwNzWr9mkmIl
-qJ9HhakzkbDblsOOgSu+GkGEVaDTFLkoOKxVD8ohqfpYMmNWpCnHvICfbx+qyubx
-Y9qMQUTlAgMBAAGjbzBtMB0GA1UdDgQWBBS6hqhPe57NQMnrUyoK29RDzi4kQDBM
-BgNVHREERTBDghRzaGliLWlkcC10ZXN0Lm9ydS5zZYYraHR0cHM6Ly9zaGliLWlk
-cC10ZXN0Lm9ydS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-Px98VAMrQj/axaEDyVWI+KmXV5JvM5CzJZV2Tt1QZAKG2D1qK/B8Kpri6tFLCK8S
-7cWdzU63gGaP5wONW1rD7uG2bCYlKkiEnJDafapKlS0/qJF2FNA1/6rEDOibwdT6
-yib8RrjklowyQ0pwAMm+YJ89n/MqB5SOL8jPjJEib83FZruRgTg2npKPkc7eWy6l
-XRk4jFV8NbemfAY/9o/JbecRM70stqFI0ihYPg8N7MPyB5Tr5w5OLaqRsEB+qyIy
-AqkS4O7+sMfqyRZz4qH/8s3MKspUmr7LncvBKSWOINun9P2gTJuqqOrJKg7wDHgL
-BAZNocu/Hh/kGS7R/8vneg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUOIOR9/vOXSKitXIAEB1uhk5hRFcwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
-OTU2WhcNMzYwOTAxMTI0OTU2WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVY4Vj+DCdA1Igb
-yz2UPXyniLHv61Q05LvG/1ECyuu79/Qr0B/f8IyKM+S+PiXXm7QlQAmfXWdLRd5e
-LuVUGNjXvBuDava+2yruoHY3Ay5DtmZQ0wpmK8NPRCO647G4dC+viY4lcWZtqIDR
-2mME4w+XBVZYVi3blrG99DqAIxEhN5JPJ1zqas/6JsaoMYvrS4cq5iwe5vubG6oP
-8wR2J8bfRSuLNHlBkhlctzzDsq6TG8gPajsP29nkIp7m6HKTKlsDyf+w/GdnxF+2
-pbOz3/jh/ET0+OB+eL+FO/f3EUF5WH/8pP3SkQRhWqrDeBxEXyFIB0kN6E4RKKBG
-Rhf/5KkCAwEAAaNvMG0wHQYDVR0OBBYEFImydoN/TfZT6En7jgsKNZTGro57MEwG
-A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
-LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAY
-874Wa9Z1g3WnpAOWinjjddVhnJ7B0GLMCasK7ctE74ax4kUcJKWxFjkIcF+6Pqwd
-KwVjBpDVsKGTEG5kb2cVZ1UKcoLo9PWMPuu0vHD4J4nWxciYWaZAgZgmEChRSllg
-afhj274z9wVMQMalKZr6aMw+nqxOxuDMVZFI3eJsDbpnZX7zl8RWwDhd6p+cSG+L
-nqC6xm+7gvxNFRxFh+Rb9I5h4JTSw65XLPfW+Tr3tVwJfWGrwDCLTx5QAC3yPDsZ
-LMTMMpgfHF1hgt28TdVQwk+pE0VqHUjouPIEUhFjaPpMWPiEpTjdyQFv4PDsE6lR
-d3hB7quCN72lcAz/8iZU
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jonny</md:GivenName>
- <md:SurName>Ehrnberg</md:SurName>
- <md:EmailAddress>mailto:jonny.ehrnberg@oru.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml
new file mode 100644
index 00000000..b8a78d5c
--- /dev/null
+++ b/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://stipendier.uu.se/Shibboleth.sso/Metadata">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-24T08:13:18Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <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>
+ <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stipendier.uu.se/Shibboleth.sso/Login"/>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stipendier.uu.se/Shibboleth.sso/JWL-TEST/Login"/>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stipendier.uu.se/Shibboleth.sso/DS/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://stipendier.uu.se/Shibboleth.sso/DS/Login" index="1"/>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stipendier.uu.se/Shibboleth.sso/DS-TEST/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://stipendier.uu.se/Shibboleth.sso/DS-TEST/Login" index="2"/>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stipendier.uu.se/Shibboleth.sso/DS-SA/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://stipendier.uu.se/Shibboleth.sso/DS-SA/Login" index="3"/>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stipendier.uu.se/Shibboleth.sso/MDH-PROD/Login"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Scholarship</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Scholarship Management System at Uppsala University</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://stipendier.uu.se/stipendium/stipac/login?lang=en</mdui:InformationURL>
+ <mdui:Logo xml:lang="en" height="125" width="125">https://stipendier.uu.se/stipendium/stipac/static/img/UU-logga_125x125.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">https://uu.se/en/findscholarships/processing-of-personal-data</mdui:PrivacyStatementURL>
+ <mdui:DisplayName xml:lang="sv">Stipendiehantering</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">System för att söka och hantera stipendium vid Uppsala universitet</mdui:Description>
+ <mdui:Logo xml:lang="sv" height="125" width="125">https://stipendier.uu.se/stipendium/stipac/static/img/UU-logga_125x125.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://stipendier.uu.se/stipendium/stipac/login</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://uu.se/hittastipendier/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:KeyName>springboothotell.its.uu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=springboothotell.its.uu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFIjCCAwqgAwIBAgIUTLAeR8NN58lLUTUPFHTes4fGS0wwDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAxMac3ByaW5nYm9vdGhvdGVsbC5pdHMudXUuc2UwIBcNMjIw
+MjAxMTMwMTU4WhgPMjEyMjAxMDgxMzAxNThaMCUxIzAhBgNVBAMTGnNwcmluZ2Jv
+b3Rob3RlbGwuaXRzLnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAynFD1m5a3XmEBa9TlEi6ipqoZKMddJxeoh31czlIVsu/qNGa9u8r7M9l3WRp
+NvT0QFaMtx4y39DVmxfnWPSomO7XPfqBmSnyp6zxyGouPAJkdRn40Xlp/TU0CmA8
+zfGkcF7vLNZekAr03/+swLgZqt/XwXxbI0H452km5PJfluSIAWvxkRerZecYDy4Y
+cpASDT34bADXA6C/6v8FB4kxjU/GIy6MZyMXljEnnvj3xW9B0V+0PJmmtwlQIHjC
+f8cYv5CygJyG16kaMlRz16eM4Z+Z8HbSD+sXxdMQHEwLTGPHriRmTQvTytrLi7lO
+K23l9ZYTuEb4t50nTE0TuSvIlyQZR/5OnaKr/AqHdMfdTvdiw6wJJllA/avKkbSe
+a5Z3WleR4LjezDwo6iexDGvTfuvvgbHanexmxMI34LeERvd2HL42Sje/UYfDrqYc
+34nhmS1lSLRSwXjgYNkuBuWP5lsPVSw1jzrD5y+daiyQNKzuVQLQsER47stLu/3D
+d9YxmVT9wwjrh2LdpXV//LJh+g5Cx8P3rZvNqbEWqACKdT1Nb5XGYdUoz0HvkReZ
+BfpEhHQbJc2Nj9X9j+qYin3vnNpa5s6BR5f4Qxw2HhVNFovQccM4OHRKX85BYBUm
+TYlEH/ihACccl4Qqs4Xhbk7P9KBgWGuDR+iFrj+dWOyO3kcCAwEAAaNIMEYwJQYD
+VR0RBB4wHIIac3ByaW5nYm9vdGhvdGVsbC5pdHMudXUuc2UwHQYDVR0OBBYEFG0F
+Ls9a0jbUs8fN0tuKTIe5ztFgMA0GCSqGSIb3DQEBCwUAA4ICAQCHnhXKI2udJfUK
+vK62loeBVOwpgpY9N4QmQhAgOtonC8HPMkPMRlcs8rUbSwWK+DlKlaKY6Uh//FV1
+UudXIxFvVqhuXIKay+8PGZ3GwoVhkUHlsuauRgP1cDLHuIl+PNuLpXmmExBBFRPd
+lt1y+oMO0LkRShVYQgAsniV2S7d9ax50MXktHt4lqIdvGSoyOAGj5sFe9B220iKJ
+eETwNRNKRbX78u0mWiSrELwWgKSreQYQM2WSLOdOcbEN0NZokB/oVSQcYWplcbej
+V4C5/9YhYBZ3BiVCVSpgkibq2mNYmb+HGCtapOhP3JKjKpauSxyfQ0tqB5Vzqwbl
+Brbs/Mptax4CSByd+W3aqrJvtuFrXuYiuhk+bT58JTNpmLHzGsjx0D0yyxMriKxm
+DRAwPC6hzr7YoADg6WRzLriLDTwalrG1pkOOs7p2V56A/wZQ6+kStvtbWOuKPrxn
+FRlATJXOcKC9DRx8X8dhpvSYw1EGtjeeOnr1oz7xup/lhKur6MjdpUfauJT/9G3y
+2cnM1o1/Ug5DIGGKDW8F+GC95QGD52S4tjOla6M5+m57iT3Z108yO0iDpAeLQbH2
+U1w2tV6ZUMICM2gMOu3wI3F/ynZEX7YXRXfONpf0OOR5DGRtuNUujN7JcnvmagnZ
+7yyeVZ5ExblWp/pt41o+rYe+dAQC7A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:KeyName>springboothotell.its.uu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=springboothotell.its.uu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFIjCCAwqgAwIBAgIUCJVRlyYY+NxRilekIRKvd/YZBxwwDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAxMac3ByaW5nYm9vdGhvdGVsbC5pdHMudXUuc2UwIBcNMjIw
+MjAxMTMwMTU4WhgPMjEyMjAxMDgxMzAxNThaMCUxIzAhBgNVBAMTGnNwcmluZ2Jv
+b3Rob3RlbGwuaXRzLnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAr34nCRFGEQugHKG08kcPXj/yVY4G884a/XfatzHVgTlrobcJnY4ypaQR/mXS
+qd3Fa0LnuTU28wpfA2e485WxE80WzfzdzrVXKarSAe/ycA59CkxZ3iNHEpw6YKn1
+Be0K3W6nA1CaKBiYgMhCsZyMtQghEM0pVnihGNCzjUGaZpYixfEPSaUlI8FaTDlG
+i/XISPwH0SsoZfIA6Tbg6R74Llxj9iOxkcgMMjGgI/xrr3AM2vWI7HmWwpI8qRk4
+oamzWQBH+TAhhjdtiXvlUrkIB/UjFOvw5mBCylq1q9LHdInYAdXk4HKGMPveHP1R
+3xBHPyTS56mDYessWa3cucjzihHIfEWMi4ipvwbvJsRhAQ6gO1mKiet+8dbNZ+HA
+6vG9jOJz/lD5mGfG8kcWOxFdR7k/dQRvK1rYTxYztw0SLgIg8IgfzXQMJXn76Sf5
+gYATmJ96RyfcqMSww7hNit8rk9eKizHFVjM4ft7GyX15I1jsUs8CXElzjkldSvAu
+BgiCkwRDpHPGNS7A6mQD8TxdcgMJW6L3rZsNexiSRgAq20t5CRsdbrFgl/98IngC
+xVYW/AtOeiHn7nBiv0C7oV7kkeAq1bPIQmWUSK0ZIKdvZ8iDcI73v3DyECQ9jW+H
+Ekvm/tM4lA0/e7W03MYlgYnYbAFr6PX9tkn17/rSFuITJt0CAwEAAaNIMEYwJQYD
+VR0RBB4wHIIac3ByaW5nYm9vdGhvdGVsbC5pdHMudXUuc2UwHQYDVR0OBBYEFBMX
+6i0Hwv0aL4bY8tWgL489ZJj+MA0GCSqGSIb3DQEBCwUAA4ICAQCEIgGCR4KQa4+l
+3T/FFMeqjVrGgersxVqPfCxDgzBWpSJwTvGlKrgx+aRAF8/oR77I5mHthdqOOdqR
+t9Wbv4ZToLrbWg21jg58Rdfc9zcdttA8w0UQvYdmgy2lBFoqCl2UUld0CWBwxVpw
+CM9UUViuP+2WUFqXxX8LBaPwsmeJM48/yZ7XeVe0u5JQkVXH+QKBJ2dttX3Fe68W
+ZidyltJlFVKNhLmmSEG0ACafNngNkL6qUySPx9432IocGmf1Kl1UE8m6hNCy7fQk
+VzUcD7XByCJNzbnPXITLmcwSXBjXtk+8bGjkxAUV7Dgrsbxwjq6Igi12K9jaskM9
+4AqvNyCPNfRseHtLh1LLHHiLCsyhzaquYjwXwgVHTnWO/FhRNWU9axTsLY8Ppop3
+XZA1Wb76sKSWmL5aY2hUppwVLBx6jgCVo2LMjGfYb3ZD0+cMpaqVuBirGePFFK1W
+/nJkmEr0pE3dlPqQl/k4EiFvCHHnoSCRScUeY0NuPMNiM6cO0PKwCPXKO5vKKGql
+2bGXC20AAi4a86a0Yf8rXlp59SJ68wTnxalWCXY33upvtWzTYwI8przf1HLCgkHY
+Vzd3VTbXi2hyVJyxrzMHZjWAnLw5VgooZea8z6PnM6F2mPKZfGS1eaqfHV/nxbjm
+Ke0XYDdP1Yqw/d+BRui3l7D4VWaYig==
+ </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://stipendier.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stipendier.uu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stipendier.uu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier.uu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier.uu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stipendier.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Scholarship</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Stipendiehantering</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>Uppsala universitet</md:Company>
+ <md:SurName>Stipendiekansliet</md:SurName>
+ <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46-18-4714750</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>Uppsala universitet</md:Company>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Uppsala universitet</md:Company>
+ <md:SurName>Stipendiekansliet</md:SurName>
+ <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46-18-4714750</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+ <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/sts.mah.se-adfs-services-trust.xml b/swamid-2.0/sts.mah.se-adfs-services-trust.xml
index a2e39731..7b8d6126 100644
--- a/swamid-2.0/sts.mah.se-adfs-services-trust.xml
+++ b/swamid-2.0/sts.mah.se-adfs-services-trust.xml
@@ -27,7 +27,7 @@
<mdui:Description xml:lang="en">Identity Services for Malmö University</mdui:Description>
<mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
<mdui:DisplayName xml:lang="en">Malmö University (MFA)</mdui:DisplayName>
- <mdui:InformationURL xml:lang="en">https://www.mau.se/en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
<mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
<mdui:Description xml:lang="sv">Identity Services för Malmö universitet</mdui:Description>
@@ -35,7 +35,7 @@
<mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
<mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
- <mdui:InformationURL xml:lang="sv">https://www.mau.se/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints>
<mdui:DomainHint>mah.se</mdui:DomainHint>
diff --git a/swamid-2.0/sts.mau.se-adfs-services-trust.xml b/swamid-2.0/sts.mau.se-adfs-services-trust.xml
new file mode 100644
index 00000000..1dc4f00e
--- /dev/null
+++ b/swamid-2.0/sts.mau.se-adfs-services-trust.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://sts.mau.se/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-27T11:09:37Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes>
+ <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://saml-error.mau.se/ERRORURL_CODE.html">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
+ <shibmd:Scope regexp="false">mau.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:Description xml:lang="en">Identity Services for Malmö University</mdui:Description>
+ <mdui:Description xml:lang="sv">Identity Services för Malmö universitet</mdui:Description>
+ <mdui:DisplayName xml:lang="en">Malmö University - MFA</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Malmö universitet - MFA</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
+ <mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
+ <mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
+ <mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>mah.se</mdui:DomainHint>
+ <mdui:DomainHint>mau.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:55.6087954,12.9945611</mdui:GeolocationHint>
+ <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE1jCCAr6gAwIBAgIQTJ0dg0LCUYRDgMhUK6Za8TANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBzdHMubWF1LnNlMB4XDTIyMTAxNDA5MTE1M1oXDTI1MTAxMzA5MTE1M1owJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gc3RzLm1hdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAO0BKPTVjdZ3j/rmYB67X9ilvbEDD/+Rd2e/68gR3SbM3lA1Ynt7dPyuP0Iepit3fg2DfDweJf8FAkhLsoerO1KBUNn6UKmr3Fsc7g8J5deadSUhoYeCXA8G7n2zVwI5Ui9RsPzhncQ4VaP4CoUJy0BoC1DesDiTzFx3F1T4g/yXFMTzyq22RK0RqiqM3f4Apo0uk7HIYyVdrf2ZARS4a8qVjRxknUrWPgNV96fxGQ/kyDr6laYzdyZt9a4svJlWxnc4M86AQCuwqDv+kgxEIPbPHfvh/46OqfXBMsTEA6anugJLTnIxSN+wx3+pBA8tKCzqWdLcrxIdqMwfrtxLxvS5Q7K5geZrWNvMlLeFSasPd7xMNZ6f5gypiqbsYa8F4ezXMp9DP9Xu2GaQY9XWKVn7eDJ3WGDJt1c14FnkNZdL4/2ESGe/9oLVomF6UqZRfEEBIXY6xOOscKn9FbIUYxJpCk/VBLLhxvEZz3cGBy29qswwiIcPNdniqX9oQghDMoqYQoprUi4nlI2inlDYqLjh+NurjXzXsY3swWc+ePgzXWTqfzQM41p0FcuaKUDSEu3nkl58fQ+Z41PEwgKRm+5HA94uFuocXicJVtNQzYpqaMFt/odAGKcoOtpu+84yBKQjCool37xg5Mf2ZaqIWJuOodQur19Gsb2ajT8ww111AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAGfCbYjkthJXgcishbCUfE688/sCcG0/gQHGedAKcWAYoJwfJjcwKOszn6ZIjaQbDmCGmUuJTAc7FMTnabxNcFlzx6LNtJO6llb2eHQDt5z41qOT/KH0GuqyZxTcW69l8Jk5vI5OujXagpFIFvTVoage7KGuNZUvi3ykFiPmPdx0pBGybXnvfKAUhDYgeHkTNxSiW5jZy6nSOYdL4L8ZI8uYU34YztCtC7PM5QbPg/oWt3QBWtt/YF+OkL6DH2mpLzoDm//EipRM1aW3Ct/Fu07WBppg4xDnbEH8Sa6TZg8qh2Ap2jSqEQizCuXk/O7HeoXv7w0u6PRUmqMTxnvtpsw/SR7dMPHYEIz8FlpbWdwL0po+D9UCSMKQqYexnoqjtm2bumv2QaVCKVjFCXyYSnF0oX3Ea29nBnWgBEzU/3hXvvdrsWdXFDTY98QTVxPujXMyykAiW1bqUjJ6rjgXA6wK7XBMBufAUQFcIBrZ3eg5PNyd9Nxw/GS2Z5W9cqrvX4LFr0ycQgzHAiSHtR0fBO02FyBLmEuzt2+gU+QMdYDOODGHdd91ZQokR3kjFRsCULyA389+H6ONGF1FTa1NvR3CPk/NPcR1mvhNQtydkinLCq7Vy93+5iX7mgbesUuB65g0GVEmLhr57Whd5SuSvMorFOJvtKNtgG3BL7GCzaBj</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE0DCCArigAwIBAgIQYM1SyQp5BbdI84LKUY9BMDANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBzdHMubWF1LnNlMB4XDTIyMTAxNDA5MTE1N1oXDTI1MTAxMzA5MTE1N1owJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gc3RzLm1hdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALWaY3BOZvsjuQIfqvm5sBPz1AjYnykUGNQS2PWzR088Ec4GxwoIBeCrzhT5F6px/ea5d4I1q952qFKSeNasL6GaMkLalDBa/DydNUrnrmFDxKPzuQ4dqBbVKbZGVUhKW3ETm/Oaf8Np39boCOzU/WWrELA+zxSzjWCf9p6rAq5roxG4Us0/IDoUHNo3kJax46aerg5AgHV6tOj34+mwneHi7W0Ygfl+7ZTyVT9CVDE256MttXd0LjxPZrg4WIhEyP9XoKowYtP+32zAcAGEogizdNYvN33XSAORJnUiu/pMeStCmA0fTsFV2QUYw3+Y8HkxCgVNU4gm0hcNmXzU7yYhZK50Y1Ef5E53LH4w+aloCEwcW6lm//SpYeH4iPmLzabPA9X8EEdbo39s01aQk1Z6YapRoOJ6DlxZ+SO1A5BxopheHaZpJqhehv4o/TZ7wvvu/TtgNl8QImejcIbj3D07BxuaJ1pdGRmmGnPJWI2ViU8RwlYHWgZrO2CfakBA4yQc0hKL6+0ucJIowbTZchs3hcgxFrrz8rgnTwxREAtX26RdzM+yhn0L2sOggCCM4xI7/hngVd8RW4QOA/jjRSn05o9pQFqFAGNiEniHfc6GEv6U1qhvYMm4QB4jQmlwB1lU1sjk6HslabahMpIfBV68aZNMaUWeq1ZY6BgDIB09AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAIB2GMbYJxgsAMuZaX/JX1YWuOyuRdvDD/xorkKPD1cNWVyz0pX1dprlS/M4NUjhI4+57UUZ57j7A/dZLv1zdaY3iBC+t5uVTWpVlqKDZe+9CkGKezd29sRr6e30Mu3GDAWER22EYnLmpOfi01fHKMHr/ZfMzpdPT/b6nx4Ln4g9gjDulf2Uq9awIPsmQnTvvhnRyQct0Dh1iB15YEgU2tKlq4nRciWsV04RRAtGISEDRJ0R7talOa89UTMaiuNHBsvkZth08BbW7ia78mK1psb100wl7AtnsKbDP7xkJpGPO1ajkj5n29ZXlhqFIj61gSDnUJ4+I3b7V2dY15jeFR7F7/3ZDHt1JCnTRVueaYIsEya6al/ghNLIu5/DeP8AHQS2MpKWJvciI8TqedmN9FZi7jTdknu55ECjQsxKxi5ufwvS4CL10+oe3oBQ2pGHMP+lnKj8MBfbV+hbkvF6R7NlxJPSx6JvKrlLb20gLAaXrzgvxg/cn5+7eB1+nmTS5lRhuEcrHtcCCedKeytqMlA+ERVgkbrW2ZiJAlgD120c2WYuF1AR2T64C4Px5rejL3g/seUzNqurFeltOBjvLmSN42lnporHEkyyQTyzxl5t0urC49UPOOj9kBomRzPwKOuQkoBk39EBxhosQgMAmgifXvLBya3HCE8cMAGKC+9s</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sts.mau.se/adfs/services/trust/artifactresolution" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.mau.se/adfs/ls/"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.mau.se/adfs/ls/"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.mau.se/adfs/ls/"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.mau.se/adfs/ls/"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Malmö University</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Malmö universitet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Malmö universitet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://www.mau.se/en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://www.mau.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:Company>Malmö universitet</md:Company>
+ <md:SurName>IT Servicedesk</md:SurName>
+ <md:EmailAddress>mailto:support@mau.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>Malmö universitet</md:Company>
+ <md:SurName>IT Drift</md:SurName>
+ <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>Malmö universitet</md:Company>
+ <md:SurName>IT Drift</md:SurName>
+ <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:Company>Malmö universitet</md:Company>
+ <md:GivenName>IT Drift</md:GivenName>
+ <md:SurName>IT Drift</md:SurName>
+ <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/stslab.mah.se-adfs-services-trust.xml b/swamid-2.0/stslab.mah.se-adfs-services-trust.xml
index e84e0739..be8157fd 100644
--- a/swamid-2.0/stslab.mah.se-adfs-services-trust.xml
+++ b/swamid-2.0/stslab.mah.se-adfs-services-trust.xml
@@ -22,16 +22,17 @@
<mdui:UIInfo>
<mdui:DisplayName xml:lang="en">Test Identity Provider for Malmö university</mdui:DisplayName>
<mdui:Description xml:lang="en">Identity Provider for Malmö university</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://www.mau.se/en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
<mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
<mdui:Logo xml:lang="en" height="163" width="56">https://cdn.mah.se/images/header/en/mau-logo.svg</mdui:Logo>
<mdui:Logo xml:lang="sv" height="163" width="56">https://cdn.mah.se/images/header/sv/mau-logo.svg</mdui:Logo>
<mdui:DisplayName xml:lang="sv">Test Identity Provider för Malmö universitet</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för Malmö universitet</mdui:Description>
- <mdui:InformationURL xml:lang="sv">https://www.mau.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://mau.topdesk.net/solutions/open-knowledge-items/item/KA%201552/en_GB/</mdui:InformationURL>
<mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
- <mdui:PrivacyStatementURL xml:lang="sv">https://mau.se/om-webbplatsen/</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://mau.se/en/about-the-website/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://idservice.mau.se/GdprInfo.aspx</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<mdui:DiscoHints>
<mdui:DomainHint>mah.se</mdui:DomainHint>
diff --git a/swamid-2.0/video.su.se.xml b/swamid-2.0/video.su.se.xml
index 6c8d435f..fcfbf40e 100644
--- a/swamid-2.0/video.su.se.xml
+++ b/swamid-2.0/video.su.se.xml
@@ -22,6 +22,13 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
+ <ds:X509Certificate>MIIE1DCCArygAwIBAgIUTGo2AwWxGDQMCTcevQ+BDVf3V/YwDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLdmlkZW8uc3Uuc2UwHhcNMjIxMDI4MDU0MTM1WhcNMzIwNzI3MDU0MTM1WjAWMRQwEgYDVQQDDAt2aWRlby5zdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMWjpkap7MahSnF12KcMG12rvGEDQ7wG/pZ2g2hwsUNPmm3UpQsx9Ntn56Z9+4Xi1aS8ye+qyL+LRkyFFqPF0yhUOMLzdBr4nDA1zcNvMnQFmWWq3D1f7PCbsaJhpSZ9qhlxUTxWtLIa0rJhjKsztYowumHKvdmBFnNFfAQc84N+2oQb4sAnsuBroHeoG5CFJuEOGBZ1JsKgxS+cztSXnFSG5RSkcUTjg6V0vPNzBH/S4AkoelI5TyASbXA4ztFkFSQyvRzGJNbgbGEsAz0+cTN9pGh75Fgm8wZLYxIIEW/r11YJL/oH8Jlq5Q6aw8E9nrmfr9p1I78V3BvcOctzXM/FKF8r7MMbccQRKG1K0v+UpkOixQfhWtD54nuIEsabaFqK+7TduPXxa/kgdWBhsgt0wzPw94jxpFNENuFUL0J6DnV+Pzg9jf0/9KRAWcJr1VdrDWVWHWdGMgvGx8Oy0Ym77oKhmRKMo2v/JjXycxhe8chQqf0wEebs8JnJHJ9jEGznqzmVlxbsc+l30TPGI4Uiutwxhb6N6hAaSrU54DGEP4jZ8mh3naqiRqdcF9F+ZPjyrO8yaC/VwfVZa2j9uJQLmOl1vZVGv9khfPI3YEuI13Cy9b1SsvjykNhdGS/iKBIATgZpWCnu4oVROwfIdABmmxa+Vjsfw5Xos4S5Ldj5AgMBAAGjGjAYMBYGA1UdEQQPMA2CC3ZpZGVvLnN1LnNlMA0GCSqGSIb3DQEBCwUAA4ICAQCfr3QsqcIllMLxhOeeVbAZZMNoYttFmoiHeMRRIvJxCDF0FHpME1iV0bXjePkcjw/xZEV2wcTa1j56fcInWq32lWviilfxMshsC55oGIldTIfaUKFQC+vU4WdeyzN6WUw+Bb4XC5/uIN9BxQ0ZI5e7DWSrE1YHK+nCe1GmE5+3JjlwoxGclBL2kc5n+KJZVc6eRkkMygbl0pPKJeU2KZiwYbLQRJJycISjBgiycaRlcQ0yp68AeIshbeK9MLIzMXF+Wk7jTeh2MJbu6JFxFy2Mz76dLae/hxp85Okd1YNzR1BbAf0Y1ukM2mKPZt2OZ1kK8eI57cN3JjWKJLIuEEdvYKUu/yJp7Ug540N9YDkA9/RDooSmyGHLJpOwwhYQwLYUIfuVrrSC2WYoycCi55O7zlXFaynl3CnSqYv4w/kVDxE9jUnVnNA3mP//0BhiWRnzqgP4W6T6S2T5vQ0oI+iyBzLkRC6DX6XniuKcvE6XJvrPKwz9ONSWw+ReZ77CJ+PZ4UuNR/E1zk1fEU4hheC5Clsin9iHCT1ial2SOGMm4tiw/sYzbengyMgm2AA6KkNtiTgN8nKC5W2RSpY9JdkOXke3IBVZy/Jgvqmn4Shy0LZcSvhotxvXjXBsc3HYtYGfkpG3qwH0ajg9ZEl1QFgN1/V3SKV4auxcSv0UDKE3Jg==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
<ds:X509Certificate>MIICETCCAXqgAwIBAgIUIzSeLKlp09BK8C1npcLwZxnzHlAwDQYJKoZIhvcNAQEFBQAwMjEeMBwGA1UEAwwVMzY1LmthbHR1cmEubm9yZHUubmV0MRAwDgYDVQQKDAdrYWx0dXJhMB4XDTIwMDQyNDExMTQ1NFoXDTIxMDQyNDExMTQ1NFowMjEeMBwGA1UEAwwVMzY1LmthbHR1cmEubm9yZHUubmV0MRAwDgYDVQQKDAdrYWx0dXJhMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9BEYvLVT+MQRRrsKM2tma2yNbmCtovOLwdYf5ToSWNIhksQ94bFWgu16/yke7s7w7qa3OQGvYlJd8iTws7m1gN8P1lA3mXCV9DN5rdHRFLvzxgf9jPy2eOgRnufZ3iSVwAViaeP9FBWSDS8KUEX+5GIFVoUctqOM0NPUtnx8dQwIDAQABoyQwIjAgBgNVHREEGTAXghUzNjUua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAURX+24s1uorm6JwRIPQmz6X21mH9XnwwGd31d1VSAlBUfy8EUrpx9j2oH17Yx+1dmanbiQ3HDaQGsPFWqvji4C9MzKQ/XcxSgIREYIDpBYcMPccidFTp+zrJZl7CUn8Eh0SzV1ymN2KRjL3kAbXp9YDdjvq0OPL1ZcIekgnfhTY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index b264cdde..58284147 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -54,4 +54,5 @@
<xi:include href="swamid-2.0/adfs.ju.se-adfs-services-trust.xml"/>
<xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
<xi:include href="swamid-2.0/sts.mah.se-adfs-services-trust.xml"/>
+ <xi:include href="swamid-2.0/sts.mau.se-adfs-services-trust.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0b1f04ef..16f41495 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -36,7 +36,6 @@
<xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml"/>
- <xi:include href="swamid-2.0/account.mdh.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/dedserv79.levonline.com-shibboleth.xml"/>
<xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
<xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
@@ -54,7 +53,6 @@
<xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
<xi:include href="swamid-2.0/meta2.eduroam.se.xml"/>
<xi:include href="swamid-2.0/play.sunet.se.xml"/>
<xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
@@ -109,7 +107,6 @@
<xi:include href="swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/sesam.uu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/play.oru.se.xml"/>
<xi:include href="swamid-2.0/rals.saco-s.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml"/>
<xi:include href="swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml"/>
@@ -293,7 +290,6 @@
<xi:include href="swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/mdh.hr.evry.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/lnu.hr.evry.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/uppsalaunilib.slack.com.xml"/>
<xi:include href="swamid-2.0/misp.cert.sunet.se-shibboleth.xml"/>
@@ -577,4 +573,5 @@
<xi:include href="swamid-2.0/bofur.sae.kau.se.xml"/>
<xi:include href="swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml"/>
<xi:include href="swamid-2.0/stipendier-test.test.uu.se-Shibboleth.sso-Metadata.xml"/>
+ <xi:include href="swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 1d20104d..8a345c6a 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -2,7 +2,6 @@
<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-testing-idp-1.0.xml">
<xi:include href="swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
<xi:include href="swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml"/>
- <xi:include href="swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/openidp.feide.no.xml"/>
<xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>