Merge

4 files changed, 265 insertions, 3 deletions

diff --git a/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml b/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
new file mode 100644
index 00000000..6fea0b2e
--- /dev/null
+++ b/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
@@ -0,0 +1,118 @@
+<?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://expert.demo.antagning.se/ecs-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-09T13:06: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#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.demo.antagning.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://expert.demo.antagning.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Expert-demomiljö</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Expert-demo</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Expert-demo, Demomiljö NyA</mdui:Description>
+        <mdui:Description xml:lang="en">Expert-demo Demomiljö NyA</mdui:Description>
+        <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+        <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>expert.demo.antagning.se</ds:KeyName>
+        <ds:KeyName>https://expert.demo.antagning.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=expert.demo.antagning.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIKji22WrWecMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGV4cGVydC5kZW1vLmFudGFnbmluZy5zZTAeFw0yMTA1MTExNDA5MjRaFw0z
+MTA1MDkxNDA5MjRaMCMxITAfBgNVBAMTGGV4cGVydC5kZW1vLmFudGFnbmluZy5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJxsrdz/CPtQ/llK1Fv
+5b+tDXUpQiM08egDBujkDYwFgy1U0g+e22GdX83zuqlKKwWiODOtdYsveP5ClBRF
+suEQo8UfpqxxK5zQ5eLSpBSgHCu7jWlSQqEwjjOdVnlcz4LQI30R/ffk0rbiF6IW
+LH201shFo0XeNh3GluISyNcrqg/Oi5Ngp/tWUYHyCi9Yx9tS2Yw5go2NLm1hGWJ9
+tfhpaXJstMVBkC+qKtb2NvGvZi0fBlcRXs3zlsgvqQ90TDnuUkwadWGVaF87ornS
+AzW6eOIQjciCJYPD8ok7wKo+wu8HUkQmnEJbQcYler6n3A0nYCXPgNt+969avgSR
+oQECAwEAAaNvMG0wTAYDVR0RBEUwQ4IYZXhwZXJ0LmRlbW8uYW50YWduaW5nLnNl
+hidodHRwczovL2V4cGVydC5kZW1vLmFudGFnbmluZy5zZS9lY3Mtc3AwHQYDVR0O
+BBYEFKbyaql/6m+micNe+i5weun5oUqFMA0GCSqGSIb3DQEBBQUAA4IBAQAbaNCE
+Ud2hqg/as6hUpFZnHT4J08weO31JjABj8+kyEIPiMKpzZSAHXrS838rRwDRwYAss
+iieByhOGhq3uqSqerQlh1PMPSHX2t3+JyWTqkgGnT8afxiBzMagxDYjUpZkxjjne
+D4hsip+XGn90TLT+9IxoJW01tp8g7GPU+0MELqsHwhl3xqmnvcNVK6aOLv5z0NYW
+pEKcHl/p+8Hi2USh1yiQveSFNONYAOJSzr7IOggsV3PBEI/+1MW0FkjNnsu5KrTJ
+arzGMGrsugbRuCj1v2st5mezCqTVdljTLs7HekHn+L+VkQiXrC3oH0Kteo1FDiEy
+kGv/tac9fcTDGjZ7
+</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://expert.demo.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.demo.antagning.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.demo.antagning.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.demo.antagning.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.demo.antagning.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.demo.antagning.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.demo.antagning.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.demo.antagning.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.demo.antagning.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">www.uhr.se</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">www.uhr.se/en</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Swedish Council for Higher Education</Company>
+    <SurName>UHR Systemdrift</SurName>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Swedish Council for Higher Education</Company>
+    <SurName>HÃ¥kan Pettersson</SurName>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Swedish Council for Higher Education</Company>
+    <SurName>UHR Systemdrift</SurName>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test.edusign.sunet.se-shibboleth.xml b/swamid-2.0/test.edusign.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..3b4c52d2
--- /dev/null
+++ b/swamid-2.0/test.edusign.sunet.se-shibboleth.xml
@@ -0,0 +1,142 @@
+<?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://test.edusign.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-09T13:21:47Z">
+      <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.edusign.sunet.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://test.edusign.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SUNET eduSIGN Service (test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNET eduSIGN Service makes it easy to electronically sign documents</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">SUNET eduSIGN - tjänst för e-signaturer</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SUNET eduSIGN gör det enkelt att arbeta med e-signaturer</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>test.edusign.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=test.edusign.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEETCCAnmgAwIBAgIULBv4QFjor31KZEhOfMs5l37+BuEwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVdGVzdC5lZHVzaWduLnN1bmV0LnNlMB4XDTIxMDQyOTE2
+NTg0M1oXDTMxMDQyNzE2NTg0M1owIDEeMBwGA1UEAxMVdGVzdC5lZHVzaWduLnN1
+bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAurwJv6nu3/YS
+wat6FBTjdcqurE3i1atg8JXISGyUsqLJwQd/aB43YrZGeZP/hcOSIKQ4oEcW23j1
+17BAnkIE1MzNRzHyGAq8He2TVpkjJDhpDOF05ZKJyg27R5/E27pUIBBA4zL+ZH2l
+AoHHG/Lp8HQHol8Fwy2EO9emyvSA3PJuf3E6WqAJhUwSlgiudeWWqXjaKDhFen/t
+NDKxL74dd+fMn8kVxgVCV2ndCeSBwbLpf/5AvZj+KZrn9SS84h1qqbNGhxfqcwac
+U8ZDdgwHQ+TsuMVjW5DcOZgKI4Zg/R/fnkGUEPmocng86IMmQt0xTOoTO+P+NIsj
+8lJXP6/bs1PQkHZ8TekQRjka4JguQl/WLCQv4a3b4OIxR4NwVhQZF1YdxoRPpqt1
+aFgEyzM7RALZYULNyBDgSfVMGUcKD+xyUqMAcfBDuxy2+OlL1EmBtiNq4t/+ix7B
+TOQSYkJCw+6zmXfF8xj2mHtak+9jJe5x1M1ErqCGgGnTq3EdKJajAgMBAAGjQzBB
+MCAGA1UdEQQZMBeCFXRlc3QuZWR1c2lnbi5zdW5ldC5zZTAdBgNVHQ4EFgQUOZ6Z
+kt7fQh1ZftKqAXGcHuxry0QwDQYJKoZIhvcNAQELBQADggGBAIZrbjSXlqgpQ5SQ
+DV93umsqAlIqAZ72A8iMJxlM9SqcdUmZNcBH4/2DvCZmnmtibjdXmyawx529q4W1
+oJePGBa/bpCk2fVw77N7fpfvdYPclwP4i9YUEkWPkE3PEMHZi23r87BD4f9NrurX
+POcUWePw3sq8bXwaRIjVxm7bdaarAypSvtU67//VyiOK6pXbHI5H1aEpSrqSLEqF
+nEPWHklQCNPKXiJwCkb/HnTq0Pkt9886jDoOt0yZwLzzxHLPO7blBgAXMUic/XmV
+vNFr/DAxq7E4rgHLxxNZSnywqXZzhUb2ggxxNJXiAO+3lFfNhbW6xiL4Sc+V/EVC
+/rCfdoCRNyD7VDDppd45HQjZ6BiPm6lyoLFfNSV0amm8heDNnx8pcNyhg1rGLHIM
+pi8S5yK/1k+N+psZOMJx0P6iNp1AanqEosABShMKb6JQ2jOVoerlUw+DIq7JSM7V
+kQp3tttIwnZXxYdIEye53wndSAgU+cmVMc3qtWJbnLyn++bADg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>test.edusign.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=test.edusign.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEETCCAnmgAwIBAgIULBv4QFjor31KZEhOfMs5l37+BuEwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVdGVzdC5lZHVzaWduLnN1bmV0LnNlMB4XDTIxMDQyOTE2
+NTg0M1oXDTMxMDQyNzE2NTg0M1owIDEeMBwGA1UEAxMVdGVzdC5lZHVzaWduLnN1
+bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAurwJv6nu3/YS
+wat6FBTjdcqurE3i1atg8JXISGyUsqLJwQd/aB43YrZGeZP/hcOSIKQ4oEcW23j1
+17BAnkIE1MzNRzHyGAq8He2TVpkjJDhpDOF05ZKJyg27R5/E27pUIBBA4zL+ZH2l
+AoHHG/Lp8HQHol8Fwy2EO9emyvSA3PJuf3E6WqAJhUwSlgiudeWWqXjaKDhFen/t
+NDKxL74dd+fMn8kVxgVCV2ndCeSBwbLpf/5AvZj+KZrn9SS84h1qqbNGhxfqcwac
+U8ZDdgwHQ+TsuMVjW5DcOZgKI4Zg/R/fnkGUEPmocng86IMmQt0xTOoTO+P+NIsj
+8lJXP6/bs1PQkHZ8TekQRjka4JguQl/WLCQv4a3b4OIxR4NwVhQZF1YdxoRPpqt1
+aFgEyzM7RALZYULNyBDgSfVMGUcKD+xyUqMAcfBDuxy2+OlL1EmBtiNq4t/+ix7B
+TOQSYkJCw+6zmXfF8xj2mHtak+9jJe5x1M1ErqCGgGnTq3EdKJajAgMBAAGjQzBB
+MCAGA1UdEQQZMBeCFXRlc3QuZWR1c2lnbi5zdW5ldC5zZTAdBgNVHQ4EFgQUOZ6Z
+kt7fQh1ZftKqAXGcHuxry0QwDQYJKoZIhvcNAQELBQADggGBAIZrbjSXlqgpQ5SQ
+DV93umsqAlIqAZ72A8iMJxlM9SqcdUmZNcBH4/2DvCZmnmtibjdXmyawx529q4W1
+oJePGBa/bpCk2fVw77N7fpfvdYPclwP4i9YUEkWPkE3PEMHZi23r87BD4f9NrurX
+POcUWePw3sq8bXwaRIjVxm7bdaarAypSvtU67//VyiOK6pXbHI5H1aEpSrqSLEqF
+nEPWHklQCNPKXiJwCkb/HnTq0Pkt9886jDoOt0yZwLzzxHLPO7blBgAXMUic/XmV
+vNFr/DAxq7E4rgHLxxNZSnywqXZzhUb2ggxxNJXiAO+3lFfNhbW6xiL4Sc+V/EVC
+/rCfdoCRNyD7VDDppd45HQjZ6BiPm6lyoLFfNSV0amm8heDNnx8pcNyhg1rGLHIM
+pi8S5yK/1k+N+psZOMJx0P6iNp1AanqEosABShMKb6JQ2jOVoerlUw+DIq7JSM7V
+kQp3tttIwnZXxYdIEye53wndSAgU+cmVMc3qtWJbnLyn++bADg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.edusign.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.edusign.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.edusign.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.edusign.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.edusign.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.edusign.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.edusign.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.edusign.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">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="support">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90-20 59 100</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 20 78 60</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
index 42286532..f37caebd 100644
--- a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
+++ b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
@@ -105,9 +105,9 @@ xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
     <md:Company>UNiDAYS</md:Company>
-    <md:GivenName>Andrew</md:GivenName>
-    <md:SurName>Bullock</md:SurName>
-    <md:EmailAddress>mailto:andrew.bullock@myunidays.com</md:EmailAddress>
+    <md:GivenName>Alan</md:GivenName>
+    <md:SurName>Buxey</md:SurName>
+    <md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>UNiDAYS</md:Company>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 646efcb4..66d348c5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -693,4 +693,6 @@
   <xi:include href="swamid-2.0/rehab.test.uu.se-ticketserver-.xml"/>
   <xi:include href="swamid-2.0/laas.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vgrgu.port.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/expert.demo.antagning.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/test.edusign.sunet.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>