Merge branch 'master' of git.swamid.se:swamid-metadata

5 files changed, 248 insertions, 43 deletions

diff --git a/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml b/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
new file mode 100644
index 00000000..a15d7398
--- /dev/null
+++ b/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
@@ -0,0 +1,61 @@
+<?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="http://adfs.artologik.net/adfs/services/trust">
+  <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>
+    <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>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Artologik Survey&amp;Report</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Artologik Survey&amp;Report</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Survey&amp;Report är ett webbaserat och flerspråkigt program som gör det enkelt att skapa professionella enkäter för undersökningar och utvärderingar.</mdui:Description>
+        <mdui:Description xml:lang="en">Survey&amp;Report is a web based and multilingual program which makes it easy to create professional surveys for evaluations.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/en</mdui:InformationURL>
+        <mdui:Logo height="64" width="350" xml:lang="sv">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/sv/logo.png</mdui:Logo>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/en/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC5jCCAc6gAwIBAgIQFarUx438v7BPvXGMcHQUSDANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBhZGZzLmFydG9sb2dpay5uZXQwHhcNMjAwMTA5MTMwMzIyWhcNMzAwMTA5MTMwMzIyWjAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBhZGZzLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4Hzoa2RMWIF5zAH9H6/TgeonwUoqo4sTU/SE3tTmz+0siwYJHna0rqLoM0iDy7MdkJpjHiNsyktVpDHw5HEY4paTY6Bc4hfhOn/KJsEFXpmNw6K2hLnKYzyU9zMCm6NDNYjuZgaHbhU+zcpJ1zoOJgwbbHksbrzVye+tibKUrpjC1TWXzObai+FquiW6xi/zltEVxwfIx0jiJyGeW68QnZxN/J19azp9adEGSOWNtjoSco3g1nWkzQhBmGjUNi0VhOOO+La8AjVu8j/dQTFEgzZm207ChATzh8aJrPmJL8hecaSrCCwVzopG9MGrichV9ApvEXZwcTHyoTvtUrVaFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAE+mBfn21OQ+M+JkfYsog5nkFrb5B+prexP4u/DSTFdlGvuLjodHMfjwumlRjp63Qq/Jfu+xaokWRfL7XRmBF3ng2tKuv6Uq+oC+7hTVWMvDxWlXjOWd/TyeT016CkhgylLA0I6iSwQ4PgYwzGXuyXx7K7qEIwj15m7NBrfDU9reZgYkNZYiKAobehP8lyDTcjGDe+zj1iw1R4TRb7zFulsGcpVSRfb5+3G1SPKnn/oF17/6vRYVlU/wogPFn5sX/Z8pegelYcL+8WgJzuNzg6QcKGum4joNRAdRMLuIOfN4w7GToq09HQMEStE/3ZhwyN0Z94yBwRpCcAplVpv4Ff0=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC4DCCAcigAwIBAgIQdp67wCZJ/axHjAU2MMsbOTANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBhZGZzLmFydG9sb2dpay5uZXQwHhcNMjAwMTA5MTMwMzI0WhcNMzAwMTA5MTMwMzI0WjAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBhZGZzLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyeL8LiKCcTHN6OaNcbspb4RYzRpSdUb+GTf+M2mND2r/smEqbPfbulvtLZp6vgqeAz+LrbptgMWiog5+mtKkzmqCaoxGtO5Ol7lk3vlXkKq8O+k3Gjw8rZpKEOqICwnA5Y7Hth6w4HVUNBcO/9J3VCRcBxsAA5DPdKKPreN+K9N/n4DOg4QFGoE5TUr6muDl6latpwSOFNoChi9TfSN5DiZwN/QVZM/JVQ7etrNhfeMZsIHOGx3kInMRdUsrZFQn33WB7CwB16/drI9E7OQoWy+WYA4SrUGknBvX8WNq21p/t8D1fc/OHADGywm+S8cyxlXt28/phB7E8qNDoy52pAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC+RxZ+X/HMWkPZX17GeusL1KuIr+TrZ03nennXlDjnTAFjT75tkufl1Cdagvoq2bFCKaD8sLLQGqn+z3VESwJdiYO26AMIwe02A9nasK4g+aAkJs+XKSJxFMNLq2qZ+q+W9OK7OePBL74Lim4ajDEhDWCOWlXJxvNPN+udJ++OeHw+xixvMuKPscLuTMLCC+idwe/h75Kz9hsveIGF0PhfwTHMrGWxJrTXjDau47CHUnwt2drEYMM8Y8J/1xY+jc0LeF/eXF33XFYhPjM9xEcrCrKB3OLWfz+TAats7ncSsVjepw5JixTlCtZ95CWsRGqZbYfTnwXQ08WD+viWNRV8=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.artologik.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.artologik.net/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.artologik.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.artologik.net/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.artologik.net/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>mailto:helpdesk@artologik.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <SurName>Info</SurName>
+    <EmailAddress>mailto:info@artisan.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <SurName>Hostmaster</SurName>
+    <EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml b/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
index 54f7793d..fd74dc65 100644
--- a/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
+++ b/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
@@ -35,28 +35,29 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>comanage-test-ds.sunet.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=comanage-test-ds.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEEjCCAnqgAwIBAgIJAIcjH5eG0jL0MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGWNvbWFuYWdlLXRlc3QtZHMuc3VuZXQuc2UwHhcNMTgxMTAyMTA0MTIzWhcN
-MjgxMDMwMTA0MTIzWjAkMSIwIAYDVQQDExljb21hbmFnZS10ZXN0LWRzLnN1bmV0
-LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvziwhI4DOM7nnpBt
-5VY3iVw+oUICX4jLEt5lvs1ovqQusxF8h3op2+KhbcrqyOqKDnM9kbzhMmELaF0A
-b35bNNaPEN3k48lzSldIG74ocn7TP/2ZhIZvXHum1QARKKdBJF2BCdsgZPwxZsGT
-C9pO/OHoQwdgCrGp2D4ny/WyI2S2e+hWoPvGBit6JEIJm5u1TVKlYc1THmW7DgCo
-cY0MKvNz98ePwiddH5gO+0e85q36A4fIsXCnDcPr1gYMuafQvQhZsXAiP/hUNwwZ
-UOJiOeSCySgk6YYEWmKoJWN/of8NJWBP4RmyWV0FGCj6FUGlS2yLwDgRhvv+HQXJ
-7bIwJthCj9Bl/6L3JtHnCnt1Ge8bF9LmJLvUSgTXlvvs4R7jJPKEnHDYSqGgkfKe
-nFck55bzpCayiDMczqgor1tslQCcSHrfUHGjEdYYr+V6INK1uYpt2sHY8GPwbPsX
-S378iPdkdLbk1Z3pxtp9fdyv5az2gltitLfrRiLTAQIYW2SnAgMBAAGjRzBFMCQG
-A1UdEQQdMBuCGWNvbWFuYWdlLXRlc3QtZHMuc3VuZXQuc2UwHQYDVR0OBBYEFN62
-ltinTA940Dq/TC0HzxzYpv/LMA0GCSqGSIb3DQEBCwUAA4IBgQBy57PYnKLhgcSF
-LGfrukXAaIfrM/RrZGKLX208dLwPt1xaAoxfK0ei522fR8iMzHgvnjNxkuPEC48p
-EGPZNlQvdCkqS7VdvhhYG6n3ctZBng2TJgXyGTnLDqBLIGCEYSyKYvtNkA/bDcOf
-KAS0lXqmJYdWOKE2jFYcQykh3i/joe07q6YwfnuRSJoEzAHJKwf1SK2LWZx5AMe9
-y3UkBNSGHT4jAN78NNnm26Emkz0RUDqyNbP4QNL4CjSDIvG1j0VJCyuPcdk34TWk
-xvzBO3bHqBQQ/6a71+c3iX9Wrx165WC/Ker0FpBBwPcvUefUH3QHlWzhoy45VAU+
-B7cEvwJBrZpe9sqpyBsyLhOGci8ipD5k8lri5fYZ5IGZ/MLDZffBY1Cy2KOHGCVt
-OeoIznsDG3cBPqXYEg2MRU07UVQUxDBnb6dxeOL3qW3nZF4wKck1t9Iys+E8a6ev
-yp3m2vGHyWxce3rs/i296d37Cw1XR7IsHn8jK9qX+XKKdwm4WB8=
+          <ds:X509Certificate>MIIEQDCCAqigAwIBAgIJANPn4Gw2poGAMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWNvbWFuYWdlLXRlc3QtZHMuc3VuZXQuc2UwHhcNMTkwMjA2MTIxMTEzWhcN
+MjkwMjAzMTIxMTEzWjAkMSIwIAYDVQQDExljb21hbmFnZS10ZXN0LWRzLnN1bmV0
+LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAuWmVFvUQzrFLbiv8
+1SGcOw63VeUsjfKHAvlIjN6GXCXRbo97tMRys0eTmrSdUjcYN3sF845p7BPWBVCb
+YkUzjcJnsnHwYb0JIpxHcfRJlZ9w/7xACBSYRzTfyJWBQ1hZyf3/VReGSnHfhNkX
+06ZNSdiqoOnwlLxFMgTvH33oZdGHJn8EvpN5kL13Xk/IkjVfbqrkdgcVb7181vSP
+VAMTm/df1D26BZ0sqtLnTDJ2IPs1FnsBAIKIY4coAHIcghfuNDKG2m34adYP2Jib
+CtNTtK8eC30o7gADKblkyTCXn2WGnqD65MGdc1yQjmy5705/tGBsEeFrAAlzJKZu
+Hfqs+nSAZy+4ZageCXlqiPJ4KD0po1QOjGpOVMDjGVbQ0BSTStjJ2D2cqHBbPLUq
+Fv9UpTd+4bjHJkq1emr3Oz231KpCJDPetiRuCRevu9tvJo2tpvxWN6eLjeqgswZ1
+j64qYb0zfY1uT4N84mpDAEc9jDyHPAsws7HFa5/ppgw7v0yFAgMBAAGjdTBzMFIG
+A1UdEQRLMEmCGWNvbWFuYWdlLXRlc3QtZHMuc3VuZXQuc2WGLGh0dHBzOi8vY29t
+YW5hZ2UtdGVzdC1kcy5zdW5ldC5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBS84spX
+YbqqiVUKnKflvrSYjVk99TANBgkqhkiG9w0BAQsFAAOCAYEAFA6x0xv0E93h2gKv
+wPgziB+Ny3q0X9duB+SduKxCVlB8S3igbZx+h5VRm54w3sQPsCvZ/DHYM5hKx4Fe
+xH5KyQEPFSn8+yvvuoUO7Fde/ArG6gm7+ID8kQj9cGYPSSZUlNkFN52Y+GZkRfve
+ti0m6lXtBWWTLp3iOYLb3F4qzaEaYWLXo0GnuEMefS6wUW6buedg9/Zs0CAwbv9B
+EZBwkHTIoolqUwjH6npesBP+z+zDXT+mMhSzl63UQT+NMjoOhNVBbauYnr0ze7yu
+x4dDU/TD7vOjCk/1FEuLY2WXhzLdq38fh1hC3jziRZaOlh7vcWXeynBJiueOTiPE
+8z5gKvtzaP+jYCh6+LuYhmnujmsbt8g15o9B4WStOV664bk8GU+yNpkJXyzQDhV9
+AFRf4SMRidNl7YEfkMCBRfCuTQJ18sLlISmi9xX2m13RjRgPndMo9unRVu2h0lGQ
+nafkdnWh9nd14troEWbKsEoSdP0WINxwbUpidopbZCWsFEeW
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-2.0/mfa-check.swamid.se-shibboleth.xml b/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
index d391181b..795e2bc4 100644
--- a/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
@@ -33,34 +33,38 @@ and do *NOT* provide it in real time to your partners.
   </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://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="2"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/feide"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi" index="3"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/idp.funet.fi"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/eduid-dev"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/eduid"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/unitedid"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/skolfederation"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/skolfederation" index="4"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="2"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io" index="6"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/md.nordu.net"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/loopback" index="9"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/DS/md.nordu.net" index="7"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io" index="6"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net-ADFS" index="10"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/skolfederation" index="4"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="8"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test-ADFS" index="11"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/DS/loopback"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/DS/loopback" index="9"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/box-idp.sunet.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/md.nordu.net"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net-ADFS"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/skolfederation"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test-ADFS"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/Login/box-idp.nordu.net"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/socialproxy"/>
-      <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://mfa-check.swamid.se/Shibboleth.sso/Login/openidp"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/Login/box-idp.sunet.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/eduid"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/Login/eduid-dev"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/Login/feide"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/Login/idp.funet.fi"/>
       <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://mfa-check.swamid.se/Shibboleth.sso/Login/necs.sll.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/openidp"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/Login/socialproxy"/>
+      <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://mfa-check.swamid.se/Shibboleth.sso/Login/unitedid"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SWAMIDs MFA IdP-test</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SWAMID MFA IdP certification tester</mdui:DisplayName>
diff --git a/swamid-2.0/test.redcap.its.umu.se-shibboleth.xml b/swamid-2.0/test.redcap.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..81c7163c
--- /dev/null
+++ b/swamid-2.0/test.redcap.its.umu.se-shibboleth.xml
@@ -0,0 +1,137 @@
+<?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.redcap.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"/>
+    <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://test.redcap.its.umu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Redcap Test-UmU</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Redcap Test-UmU</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testmiljö för UmU Redcap system</mdui:Description>
+        <mdui:Description xml:lang="en">Test environment for UmU Redcap system</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>redcap-test-front01.srv.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=redcap-test-front01.srv.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEODCCAqCgAwIBAgIUaHnok5EiSi095nL35NPHugPZpsMwDQYJKoZIhvcNAQEL
+BQAwLTErMCkGA1UEAxMicmVkY2FwLXRlc3QtZnJvbnQwMS5zcnYuaXRzLnVtdS5z
+ZTAeFw0xOTEyMTMxMjI5NDJaFw0yOTEyMTAxMjI5NDJaMC0xKzApBgNVBAMTInJl
+ZGNhcC10ZXN0LWZyb250MDEuc3J2Lml0cy51bXUuc2UwggGiMA0GCSqGSIb3DQEB
+AQUAA4IBjwAwggGKAoIBgQDfb8B//S+hGkK/9sS0i72Bsp2F1CzmVnOTPyFSp7Fl
+XkdHzJX5T0MYd894dYJb1+qeuzkoBnUC5u5Zf7dzgVZvcAK4OXjuZSERRPIVm1M5
+wzaU4FK4OoKL3fKxKgnn6cgFj7Vq66w8wWYfLv90cKaUA++1MWJgFPKIss+XDHd0
+18dtImbZzRpKDjk5TKmu2Zx0cHUaLLXUJnRcpTsryznHMQ+4BmqLe/2Yb1LCDlAS
+HyW6PkgPJ0VIv2ZMOUOFqxHijRHScnWEUzsA+PtAKgQx/RtdSnHxbrJr0oKUO6fx
+8FhmZfCOHRNTr1BzTrm8XDyrrSPoWMutNdvQ6J8N1PZZ8zt6rlY5PQCqLWpHPkpu
+ao4B7dh8/kNiA1r4X9mcih8IcK1+uhAlfCEFVDg9w5T9ClACkmVWFxzj+5IHfSdx
+hudghHnD8hSH+BOQpaCtDbi/VZamFXaP+i68m1Qqy55HMF/YCxQDsWSb1d2qumtQ
+eJoDkdOl761nwT9JZFKuTPcCAwEAAaNQME4wLQYDVR0RBCYwJIIicmVkY2FwLXRl
+c3QtZnJvbnQwMS5zcnYuaXRzLnVtdS5zZTAdBgNVHQ4EFgQUvsQM2RJMxVyJYr39
+yGC/O+v/cRwwDQYJKoZIhvcNAQELBQADggGBAIREdqylv0CdP/KQI3XigrkVyPfJ
+uAfSiH+BDTg7wELclA5RimDDC9C+UM3ZsBT6GHImqpmtO6Nl8XO4naKB+Ep847t/
+HuKr1z5qdBQDh/NzxNEAp9/LH6pZrj55m9zmqPkqGaBoYmCF40Zpjd2+SEdbdHij
+nFgVyANXSIJ1z1RoCr1tflQJxyjhxNufynAN1hJuO9Rz7gjLATMKuaYHN6r9Xhap
+py9z/E0PyZrFk1gK0V0cpzVSKS66ACSYkHSpO3y0Qt+45FmJQz0mrDlbzR5pkG72
+BTIMShd88IHaitVsLjM0KDEqQ4UrpQbAGiKGsPjWf7XIGzMux/sU+MAFtG82O3ut
+DcUUQGcUKczU5TdOPb23UOkf5X4SGliYDpg9A/RS0Kf7YrpNC2L0Lfu1BNkiIi4D
+Rb8zfraEYUdFwLQWaKRgt+z8kvBS+EIVGine90Yul1UzwtzXDJ+dXx3qG4PWq1Di
+gOamI1U7dIRCCrDkDvH3x1TBxn5j574HZiyrlw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>redcap-test-front01.srv.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=redcap-test-front01.srv.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEODCCAqCgAwIBAgIUSN/+xh5l4C5XjpMKTlLaL6PflmMwDQYJKoZIhvcNAQEL
+BQAwLTErMCkGA1UEAxMicmVkY2FwLXRlc3QtZnJvbnQwMS5zcnYuaXRzLnVtdS5z
+ZTAeFw0xOTEyMTMxMjI5NDNaFw0yOTEyMTAxMjI5NDNaMC0xKzApBgNVBAMTInJl
+ZGNhcC10ZXN0LWZyb250MDEuc3J2Lml0cy51bXUuc2UwggGiMA0GCSqGSIb3DQEB
+AQUAA4IBjwAwggGKAoIBgQC2TiDSvePatWdRMBp3OOKsqxPgxP/s0kQJXMA7+7Bi
+fE23urnvxc6sSq3D1Dp1oYF8bNUobr+ka/BRFMeH6bIr2/JsCo7rvf4yXnfiFNr+
++a+CxMtbJ6SxRuzUwwYpFDgYF+gAvxTcPwPPjdqf2rB7T7a2V9iNDj4q+5ieGOtG
+9JZFZ5YO0ALoZ4ep6k7gmcXgbZOE7OCoXjiZoeZ6thaTGjIK0Mq23Mb5veejDmt0
+r8UQCzMnguRuTXuarx8+p0RmeOubN35W6vXtLB24g44pYzw594ZWRRg+k1pqsHeL
+IrNhCgwN/CsR3Ad9Lu/XEGqdl9sumBpTd1mFkG3NeBm8cgxGCwn8yOL5/Y1G0NVw
+3hHjBuQjzrweFCtHZ6UoYhrxAZfPqsEdjnmWGwgp52Bha2d+yL+/FPAwLlxe6Ngo
+x2UBgWhtbtT9PKoYxeNSmGb+OeZvKG/GNm38I+T6DuoDTl4gZYOA+PrYUTfoJT8D
+28IWiknCD7wYi+gr8hVWj+kCAwEAAaNQME4wLQYDVR0RBCYwJIIicmVkY2FwLXRl
+c3QtZnJvbnQwMS5zcnYuaXRzLnVtdS5zZTAdBgNVHQ4EFgQUxioyZzw3RnA+IFcj
+1QdsD1JQ8xwwDQYJKoZIhvcNAQELBQADggGBAF5PwmJfMhmbvOSulpzJNXMpk8cj
+xHc7E+B+U8HrKvGaI22bW9GRf6URGKL/ACGL69Oc3OcQ2xgqeMHEqIVN9rCfGV1K
+SNcYjGmVrlVdMwVww7WLWRE3Nw3hl14Cw7+C644uQLdwMIUCPXFWC8yk3/a6khmx
+wBW5ni5xF7DGUOKWrsCwf6BuNdKfESXYQ5rhALiumb9gnG9m1GQU5CnFXI9crR4o
+M0YHPl5u3d4hWgWHNpilGO0kiSn7berqpFf+8+g4V6msfCFmLdn2VqF9L8gceWag
+vcqj+ddkfRbb7qmwAKG5kyHsE43h2+/fBJhoPwDjSDG7XISJfjqB8X0nejlRQ8PO
+POghxW97YUE4+U82B7IQQLVm8MzaJsjvsRaXTv5/TfKqnXvv/HMVJ6/QMLQh6aV+
+cfmdYOeFAeCHqrgJAhLrsCeWOYyz3KrxOHf5fvqgE98YPaGBdfO8zAO+Kfg3MqoJ
+oDDrTtHOHmAqJN3+DhTUK6VRPLx7CaW8UiRYMg==
+</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.redcap.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.redcap.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.redcap.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.redcap.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.redcap.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.redcap.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Umeå University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ITS</md:GivenName>
+    <md:SurName>Drift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2d243358..bb7be9f6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -613,4 +613,6 @@
   <xi:include href="swamid-2.0/intranet.nai.uu.se.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/outscan.outpost24.com-opi-xmlapi-action-showspmetadata.xml"/>
+  <xi:include href="swamid-2.0/test.redcap.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/adfs.artologik.net-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>