Resolved SWAMID-2720

3 files changed, 284 insertions, 0 deletions

diff --git a/swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml b/swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..9cdc0b93
--- /dev/null
+++ b/swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://bdh.demo.its.umu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Bedömningshandboken Demo/Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Bedömningshandboken Demo/Test </mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Bedömningshandbokens demo/test-miljö</mdui:Description>
+        <mdui:Description xml:lang="en">Bedömningshandbokens demo/test-miljö</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://bdh.demo.its.umu.se/om-bedomningshandboken/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://bdh.demo.its.umu.se/om-bedomningshandboken/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://bdh.demo.its.umu.se/om-bedomningshandboken/personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://bdh.demo.its.umu.se/om-bedomningshandboken/personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="83" width="83">https://bdh.demo.its.umu.se/static/gfx/uhr_symbol_lila.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJANHQqF3Mbs3CMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDFaFw0z
+MDAyMjUxMjI1NDFaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
+ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAM5L4cIRxGtWahSPBEIX
+D76addYg69ByTUteOI80QEVREf/b7m7dDg6AUXHCNk3h4haM61pMUoh+ii0HxH6m
+3+lGGA1BlOgY70Spj7EwkI1EEJZfdd+1Ywyfaqd0xwlXuB5ZILtg8dByyyQ89Did
+yg3VrwAYPebK1iaKXXtRP0OsUQXWs8ugguxNdsJ074TXsANCLvreiVoTJ2VcOYgc
+0IsNfpxhY/Lo4TiB1Ku62RCD9kP9C4duGFSG+VrPgWIGvn3PDyw7YKMKAFRUI6dx
+zM8uSlg+PrA/JSEUEsOtnKsBATuLOJCcFsB2vZIBeRbHG53MuM2YHpBa+FiFfWoj
+o2ONdIq3uZk3KiaXGqTrNZxKf3dW89nrfm/IuftqVs8cmv1zWcGUmlCLXZ2SWkn2
+CdC7F/ZScz85LZJ/rX8MiKWygUL78Gxm0dffx4CtVX1WYkHqniHOPgPBAttLr2oB
+KbJLj+ugUAvhEn99iorrtrjPU+Ey7YHQcIEuntgxnYzVmQIDAQABo0YwRDAjBgNV
+HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFNVLrfTg
+dfzN8FOQ5XLPpVe4qyaVMA0GCSqGSIb3DQEBCwUAA4IBgQA3pi3hlMJuc6O+qfpA
+FCFzQtMaKldYrO+0E5ZOzBo6N3HV5oUIK9s6e9wo3D/e7qrbfqPyf+8neAfxqyo0
+ugKlHKlA6IykFdX+0JLg3bfghrfsBqCBAsKx3crgMpAEF9CfHQiGN+pdlYuqQA6X
+mik9l3ZaK3BnH3+9T5337uiYSwKQcsNwo5E6hImfinOzLnYny1QLI/0hpBt6IFpY
+Iv85BTMxpVal4z8awFTKer4ThX1B/NM/beTpetooDILX1elIUZ1vLrLvzoyt+e6k
+sinXW4kA7vxrPpzutvPcTEN58sdSNVEP9n7jaEjkw3bp+BRpFKvqzzIPsByb1EdG
+RbPZ78tkYGz+Kz68zAjdpG70G6XGHiUKIDijceYXvu4jpk5FvhRMue4km7mKipjY
+rzPNj9qEZVSKA/aRMcgrji/gmwkljut3AGshBQK/Vcstf8q4LM+hpJtLwhA/z4Uv
+bIQCFPm21t8oXXqwFgsCPBdI3GKnueUCa4NVU54cDubC/38=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJAPVopcz9TYRqMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDBaFw0z
+MDAyMjUxMjI1NDBaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
+ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJW8n1E/iwIwr0Oxnxix
+P/cC4H8Dep97H52MLbDjFVrUnrMBsUj3Bkrn17OKQWHaGeb31t9xgV/qcF2Q1lau
+QIWoik7kuG9vxaLDYgPsg9bmo21MxxyxTq/kqv/QgWtjFiRyCMBJoADo16LuqVne
+7FSk/gjqNB/p4Zl3/8Xm/uMrYzvMh9y+ZSYUKhPaT/6nytdvPRo7w/DsgRNmDEr0
+g1eBC5Dt0D52owESfyhYeOjOOvNlxG2cSf0vM2Qv8A25YA4+z+df9JjNppBfnUlO
+DEQqZ/FMijb5t93MxSb1EY3dKAfnj9Ghl49yuDHaaLZJagp8RcBgwZbnrB4JoLUn
+zygCkuZi9WZEHRG1wL6Eu2LN2zI01YdewEaPE0oQI4XxwfyS1KKIllICBEwRJcW4
+Oqb77Fbne04vbkXudCJzOtjSjgkqu7M1Prb1SnIMOSpsa/FYM91mSA67tniNQ2Cw
+7Yi8UnMoJ/xSEegI5PX6CzrCqSnHX2pbLlVz45Il/gn9BQIDAQABo0YwRDAjBgNV
+HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFFDjqqVs
+c+eciHvKv6lRUWGs9J2VMA0GCSqGSIb3DQEBCwUAA4IBgQBqQ6Zo7uPfd0cQ8Mg4
+RZPK+aUh5nnLjCGtirgXEPfOsABDTl6WaWaT3UowcFJVerJsEjxeG3j/OFZeN6RH
+944+GWYV0rh6Kd9tPxHMt0bCGm2y5X0GNegsz101FjkxQ0ptufCHjjT6nGuPBKmy
+xg9xbx0AIZfvY9+8ukQG9ICxc3yaWhfwPSvZiSRguQsn6WkNAQazuq/gZ51QV8fn
+r7jIA7P/4QTcc1oxITG107OrhPWVLF14pU5wX9x1mkQh1AZ/cuCxU3Plh11DPzsw
+72A3RJq/JfcFfiS+s0eZhvLj4bZRE72fAvJagmch05EDSxTR5dVkL4blJ+UBrkYL
+8wcAFySPmX2B9APEBpxG9bQBRdefcZ/LHt27sO/1u3gK662JBxAgeS8V72QWRPbu
+JK6qeJIQLyvDHXkt5u6UxFnJfW7JNiH6DmJw5oUDIMQWgfXvl+y8VVryU7R9txD2
+KW3i0DN94dcdT/QUFYLJBwV+9zTb9jK+yNWst2xyRDEAVcY=
+</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://bdh.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml b/swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..e1955933
--- /dev/null
+++ b/swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://nyas.demo.its.umu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Nyasidorna Demo/Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en"> Nyasidorna Demo/Test </mdui:DisplayName>
+        <mdui:Description xml:lang="sv"> Nyasidornas demo/test-miljö</mdui:Description>
+        <mdui:Description xml:lang="en"> Nyasidornas demo/test-miljö</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://nyas.demo.its.umu.se/om-nya-sidorna/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://nyas.demo.its.umu.se/ om-nya-sidorna/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://nyas.demo.its.umu.se/ om-nya-sidorna/personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://nyas.demo.its.umu.se/ om-nya-sidorna/personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="83" width="83">https://nyas.demo.its.umu.se/static/gfx/uhr_symbol_lila.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJANHQqF3Mbs3CMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDFaFw0z
+MDAyMjUxMjI1NDFaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
+ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAM5L4cIRxGtWahSPBEIX
+D76addYg69ByTUteOI80QEVREf/b7m7dDg6AUXHCNk3h4haM61pMUoh+ii0HxH6m
+3+lGGA1BlOgY70Spj7EwkI1EEJZfdd+1Ywyfaqd0xwlXuB5ZILtg8dByyyQ89Did
+yg3VrwAYPebK1iaKXXtRP0OsUQXWs8ugguxNdsJ074TXsANCLvreiVoTJ2VcOYgc
+0IsNfpxhY/Lo4TiB1Ku62RCD9kP9C4duGFSG+VrPgWIGvn3PDyw7YKMKAFRUI6dx
+zM8uSlg+PrA/JSEUEsOtnKsBATuLOJCcFsB2vZIBeRbHG53MuM2YHpBa+FiFfWoj
+o2ONdIq3uZk3KiaXGqTrNZxKf3dW89nrfm/IuftqVs8cmv1zWcGUmlCLXZ2SWkn2
+CdC7F/ZScz85LZJ/rX8MiKWygUL78Gxm0dffx4CtVX1WYkHqniHOPgPBAttLr2oB
+KbJLj+ugUAvhEn99iorrtrjPU+Ey7YHQcIEuntgxnYzVmQIDAQABo0YwRDAjBgNV
+HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFNVLrfTg
+dfzN8FOQ5XLPpVe4qyaVMA0GCSqGSIb3DQEBCwUAA4IBgQA3pi3hlMJuc6O+qfpA
+FCFzQtMaKldYrO+0E5ZOzBo6N3HV5oUIK9s6e9wo3D/e7qrbfqPyf+8neAfxqyo0
+ugKlHKlA6IykFdX+0JLg3bfghrfsBqCBAsKx3crgMpAEF9CfHQiGN+pdlYuqQA6X
+mik9l3ZaK3BnH3+9T5337uiYSwKQcsNwo5E6hImfinOzLnYny1QLI/0hpBt6IFpY
+Iv85BTMxpVal4z8awFTKer4ThX1B/NM/beTpetooDILX1elIUZ1vLrLvzoyt+e6k
+sinXW4kA7vxrPpzutvPcTEN58sdSNVEP9n7jaEjkw3bp+BRpFKvqzzIPsByb1EdG
+RbPZ78tkYGz+Kz68zAjdpG70G6XGHiUKIDijceYXvu4jpk5FvhRMue4km7mKipjY
+rzPNj9qEZVSKA/aRMcgrji/gmwkljut3AGshBQK/Vcstf8q4LM+hpJtLwhA/z4Uv
+bIQCFPm21t8oXXqwFgsCPBdI3GKnueUCa4NVU54cDubC/38=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJAPVopcz9TYRqMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDBaFw0z
+MDAyMjUxMjI1NDBaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
+ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJW8n1E/iwIwr0Oxnxix
+P/cC4H8Dep97H52MLbDjFVrUnrMBsUj3Bkrn17OKQWHaGeb31t9xgV/qcF2Q1lau
+QIWoik7kuG9vxaLDYgPsg9bmo21MxxyxTq/kqv/QgWtjFiRyCMBJoADo16LuqVne
+7FSk/gjqNB/p4Zl3/8Xm/uMrYzvMh9y+ZSYUKhPaT/6nytdvPRo7w/DsgRNmDEr0
+g1eBC5Dt0D52owESfyhYeOjOOvNlxG2cSf0vM2Qv8A25YA4+z+df9JjNppBfnUlO
+DEQqZ/FMijb5t93MxSb1EY3dKAfnj9Ghl49yuDHaaLZJagp8RcBgwZbnrB4JoLUn
+zygCkuZi9WZEHRG1wL6Eu2LN2zI01YdewEaPE0oQI4XxwfyS1KKIllICBEwRJcW4
+Oqb77Fbne04vbkXudCJzOtjSjgkqu7M1Prb1SnIMOSpsa/FYM91mSA67tniNQ2Cw
+7Yi8UnMoJ/xSEegI5PX6CzrCqSnHX2pbLlVz45Il/gn9BQIDAQABo0YwRDAjBgNV
+HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFFDjqqVs
+c+eciHvKv6lRUWGs9J2VMA0GCSqGSIb3DQEBCwUAA4IBgQBqQ6Zo7uPfd0cQ8Mg4
+RZPK+aUh5nnLjCGtirgXEPfOsABDTl6WaWaT3UowcFJVerJsEjxeG3j/OFZeN6RH
+944+GWYV0rh6Kd9tPxHMt0bCGm2y5X0GNegsz101FjkxQ0ptufCHjjT6nGuPBKmy
+xg9xbx0AIZfvY9+8ukQG9ICxc3yaWhfwPSvZiSRguQsn6WkNAQazuq/gZ51QV8fn
+r7jIA7P/4QTcc1oxITG107OrhPWVLF14pU5wX9x1mkQh1AZ/cuCxU3Plh11DPzsw
+72A3RJq/JfcFfiS+s0eZhvLj4bZRE72fAvJagmch05EDSxTR5dVkL4blJ+UBrkYL
+8wcAFySPmX2B9APEBpxG9bQBRdefcZ/LHt27sO/1u3gK662JBxAgeS8V72QWRPbu
+JK6qeJIQLyvDHXkt5u6UxFnJfW7JNiH6DmJw5oUDIMQWgfXvl+y8VVryU7R9txD2
+KW3i0DN94dcdT/QUFYLJBwV+9zTb9jK+yNWst2xyRDEAVcY=
+</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://nyas.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 76f6e736..77a0cb53 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -616,4 +616,6 @@
   <xi:include href="swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/test5.release-check.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>