Partially resolves SWAMID-3518

4 files changed, 259 insertions, 104 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 655b4cc8..ab84f9ed 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -60,7 +60,6 @@ idp.lnu.se-idp-shibboleth.xml
 idp.mah.se-idp-shibboleth.xml
 idp.nordu.net-idp-shibboleth.xml
 idp2-1.slu.se-idp-shibboleth.xml
-idp2-test.slu.se-idp-shibboleth.xml
 idp.test.antagning.se-aws-idp.xml
 its-pd0328.ad.umu.se-shibboleth.xml
 its-pd0030.ad.umu.se-shibboleth.xml
diff --git a/swamid-2.0/idp-shib.slu.se-idp.xml b/swamid-2.0/idp-shib.slu.se-idp.xml
new file mode 100644
index 00000000..c769bbc8
--- /dev/null
+++ b/swamid-2.0/idp-shib.slu.se-idp.xml
@@ -0,0 +1,258 @@
+<?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://idp-shib.slu.se/idp">
+  <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">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (ny)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science (new)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Shibboleth Identity Provider för SLU.</mdui:Description>
+        <mdui:Description xml:lang="en">Shibboleth Identity Provider for SLU.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://idp-shib.slu.se/info/om.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://idp-shib.slu.se/info/about.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://idp-shib.slu.se/info/integritet.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-shib.slu.se/info/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="102" width="102">https://idp-shib.slu.se/images/logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>slu.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxNFoX
+DTQwMDkxODEyMzIxNFowGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
+BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsR3Ce/qb3iyn/SE0/4NBDez7pTv8
+WXJIMSBxCpjhAqj9N5rdcZpTnuQCVOHRuojT95ng6wXxZtRqcvmtoOu+YspV+GVi
+iK2zOR321TQd24Bw4Jym5JJ8exUaTzXEdRZ8iEx1vbKuISVKRzNkYLpbRFwWmtwZ
+4NsXZZ8HaTjPvDcWdPnhL6DKgbNgIX5WMML3bVZw5X6GzjRtfgruB6urkwPH0K2W
+NumhbmABvs3uFzDL28OZ9aYBL9w6oY9/KntsfQeROWaJuQDULmlW/mS73DD8bX+r
+fAweoGbNfa390nxkBnhlsONsbQKM0mQaTRKaHcfxRXndHgsxeuP1O4zQK3Lw0be2
+fw1vcpLhtdUxCaUsyVj1zfU9Z15LdyKd0zSe0prbRm0Zpgew3ZDq9IRabuo9dnXa
+ExtFuFZdNBotUiKFRyvurKP+8f/6pgjc4Cdf+NeOiOIvoEhrna1hvUWydfFk41X/
+BPdWZeKJ6d0ohB81MTGMzx1CwENzKzAzNw35AgMBAAGjZTBjMB0GA1UdDgQWBBTv
+eHIkHnbocyEjglf8XgFUXRVLWTBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
+Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBgQCTmD6u4TVtBD0+317QyjnjtigT9mV6eQh27j3EioDbsUPKRs9x
+D8QDqA365v0puxUxR5+FEuyLP9KReMH9ChPxLAjmWS27R/9QnBP+ebly+IHyzbsU
+3kdekOs0nkr22ARBOoJ9PvRRWoq6t+c1G2rDiBTVhQqDfl9+miPbPKHvWt3/GYl8
+MhcOijELu1QzaOUFg3bel01emigFy8eikvHdNmU8LEqbwdl3/bzR0vLnTdCTZzRS
+ft3olZwcny84Nx6Ql4Emmpwy5+UBth7tny+l3SeeaPIEcCYP3bMoODjOyhYu8zoo
+GJBaVeOOmSKCrscIVIjwF5gwJKjY8ewSHw+57Qk7oApOo2RHHy1+XCkd7djLxLeJ
+ufIV5d7gdyWrCh6cM53cqU5lJQF/UM/0QCtpeg6Ld8LpnX+qlfZLObzE+LN4lrcR
+SktSFtsAxKMkt86J5whFsuM11acH+UzNI38vNEzHhrlVPdqr9Wfi1kwn+sO3KMe4
+wPg6Xtq8Rb1EphE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxM1oX
+DTQwMDkxODEyMzIxM1owGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
+BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAip5MBDd8vgTvs9n2egO7WrcekJu8
+oE1lc0S0mfKgJx8/B3L21p2AeNJ5bpCu1bfseMG+LGVk9Ak0gVw4bC3k1BDqgr9l
+XVoQsoBm9akJQkFE70Dn5YKp69ElZEK1lOW+sdOZ57ZYieUJ2EUQtwzuQraofARt
+giQOck8cQ1pMuWwGpt56FlQiIfte2eP3UFdosdO+HZovnuudC+FSmFs4fZK44nuL
+I4NIs6x5kMroMRPj28TZyiDFhqc5OacvTISqknIAZibEvVgWjwozUWHfZCxiz8jf
+myRDqxiHXrAw9OSweMhLYVtuvgMjinmLp1qKH8Xyo6zcbnugadSbiWtN+plGJOdD
+3H3mKSMGVBhC/fJ3IHLb8jNoM2F0fI1j+t5AAhXgmHrso1UCH51j2eKZCaEnco2A
+sFTJFQH1dx7z3vGBwbBGN40L2+E/9Muy4OhktTq5S8Q3FwSQKfL7gTsnGaEGVdAX
+Bd1GBBXmPSdDEoG4OD0uBrU9W4guqUsfhfKRAgMBAAGjZTBjMB0GA1UdDgQWBBTr
+BKReDs0/3v2lO20AjqHW/BvwRzBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
+Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBgQBU9FjUNNd+j0zM0d5d8E7PaSBr2Ur6obOtRkK1OvgVXwzyVzLW
+F4Nt8wH1TnVoSYS7rkaaXfZyUxDdZidOX8vlY437C1VrJj1lhDfL+JyZWvP085v8
+37ayXrUbQZ0O8mI3y/JtvbnmvCaGACDHO1BdCNF0a7Grgnchx2LpFJBeeISiJDQA
+HQ/WWsWm55wBUKjOmSR1OwdpaqjhfEbSjz0EEwpvtpdhyOvhOmcRsUufyS1E1u3L
+i6MNP47jwhxYb5mSxS/ztV3bvVAESh6hzlgNUzvhfCkZqMvcYKbaOole6dNjK1mF
+Y3Dry6gqRyCsKHGJMm//vdtfLarTLv5y7H1ZHAGxRikyWS+Y/iziFPY2npJizkyI
+6HlPnaQZM1Vuy1Oreottr929cyUQqonWt6+b23G2WbAbOab9uKWPMLe4tOBiiDE7
+ujeic7u2uPDoyu8mYgS3r++bjQrfqRRo/wYI5VF/n3KSFkCXZPx3CxbkMJBG6JeA
+UgKStld+SURLHX8=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTAeFw0yMDA5MTgxMjMyMTRa
+Fw00MDA5MTgxMjMyMTRaMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAI+DF3Vz6IlU5hxi+a3718iunTb7
+otIKbB4q5xWeFOKawlzQ1yLHe1BoNAb7tMc2X07804OxZblqh3SEjBexPv9Of/7f
+iltbRWyKGskjqVyskxzuk/H2sv3j9jKF+umWvTjb4t4RDpLjagYWti35hOvBXM5A
+bTSphHapUIcEowaQ1echecNQUOoduqntM4mZzEAMCEdtoNk/Tx9fOoo2avvkKwBs
+6ITxAAe4FVReVR93o5vMTwkV1nbPniwqHYURivRhudg8z5Y3Eq3gvA4ZvWWUV0By
+UKVhdQ+1QVCjMTfmIbO3BS/nASreTWWzINtaU1bw8x5qnePRFwnBAtykoet0hexx
+HDL/v8n8HrMP8iG+ymWII0gfKq5pNuDf2yTpnxNkzW07JcJRaMIORy2dfts3VvpG
+8SlAT71k4F6aPIyNEVQwyaGvtcYVB8Lnr0DhXszrSlUCmRATepYHOZib06ieSph9
+wTxKMlcjFUCH/EAvLD4C/qF+NKgcsuFt5QHMTQIDAQABo2UwYzAdBgNVHQ4EFgQU
+lPxFc2SumHftUVBWOKqt5OaNJb8wQgYDVR0RBDswOYIPaWRwLXNoaWIuc2x1LnNl
+hiZodHRwczovL2lkcC1zaGliLnNsdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAYEACKA9LILXqOIYgumpfeohy8ft3l+h33NPGPuXXlViwm1v8uWo
+ACRvrARooOllmFaDJNrilHGSi34bYnLIeSpqhYzLc8tauTP/jwmHdq68WEQdC0s7
+uhC6O2JBdhgpUGXMpjuPuuwH6DdXHQymYMjGNDl4NUwl7N3Hod8sJjl30HpJ7f4/
+UV10MuCAh54MWeBHo2ooxEsgYU06qvkT+hO5tAtgR1vDHLoPBqMgPhY/PjsxF5WG
+SWe/AdSARRe4hxWBNwHSo1HlrpG/Gobhh/yluvSVLMd8BNdjKWWFaSwNCe0tw91U
+dt5jXfcmrDtr6sRuHoEmrm27lk9q4cj82Do1f5q79v51jYMtITNOpGZlx5Dskmgk
+cJo78+sWNUwKDrCtXE6e6hs8W/RD7VDZtP7OIvCVZpjCodjoiPdz8zOirIFcahPf
+jHiyDn2ImKKJdsVU8n21d7aEShNxDviRnRhiZaILmaqVZHvslZq32XNbgZTPySWL
+ffEVzH+iKOe5hd6R
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shib.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shib.slu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+    </Extensions>
+    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxNFoX
+DTQwMDkxODEyMzIxNFowGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
+BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsR3Ce/qb3iyn/SE0/4NBDez7pTv8
+WXJIMSBxCpjhAqj9N5rdcZpTnuQCVOHRuojT95ng6wXxZtRqcvmtoOu+YspV+GVi
+iK2zOR321TQd24Bw4Jym5JJ8exUaTzXEdRZ8iEx1vbKuISVKRzNkYLpbRFwWmtwZ
+4NsXZZ8HaTjPvDcWdPnhL6DKgbNgIX5WMML3bVZw5X6GzjRtfgruB6urkwPH0K2W
+NumhbmABvs3uFzDL28OZ9aYBL9w6oY9/KntsfQeROWaJuQDULmlW/mS73DD8bX+r
+fAweoGbNfa390nxkBnhlsONsbQKM0mQaTRKaHcfxRXndHgsxeuP1O4zQK3Lw0be2
+fw1vcpLhtdUxCaUsyVj1zfU9Z15LdyKd0zSe0prbRm0Zpgew3ZDq9IRabuo9dnXa
+ExtFuFZdNBotUiKFRyvurKP+8f/6pgjc4Cdf+NeOiOIvoEhrna1hvUWydfFk41X/
+BPdWZeKJ6d0ohB81MTGMzx1CwENzKzAzNw35AgMBAAGjZTBjMB0GA1UdDgQWBBTv
+eHIkHnbocyEjglf8XgFUXRVLWTBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
+Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBgQCTmD6u4TVtBD0+317QyjnjtigT9mV6eQh27j3EioDbsUPKRs9x
+D8QDqA365v0puxUxR5+FEuyLP9KReMH9ChPxLAjmWS27R/9QnBP+ebly+IHyzbsU
+3kdekOs0nkr22ARBOoJ9PvRRWoq6t+c1G2rDiBTVhQqDfl9+miPbPKHvWt3/GYl8
+MhcOijELu1QzaOUFg3bel01emigFy8eikvHdNmU8LEqbwdl3/bzR0vLnTdCTZzRS
+ft3olZwcny84Nx6Ql4Emmpwy5+UBth7tny+l3SeeaPIEcCYP3bMoODjOyhYu8zoo
+GJBaVeOOmSKCrscIVIjwF5gwJKjY8ewSHw+57Qk7oApOo2RHHy1+XCkd7djLxLeJ
+ufIV5d7gdyWrCh6cM53cqU5lJQF/UM/0QCtpeg6Ld8LpnX+qlfZLObzE+LN4lrcR
+SktSFtsAxKMkt86J5whFsuM11acH+UzNI38vNEzHhrlVPdqr9Wfi1kwn+sO3KMe4
+wPg6Xtq8Rb1EphE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxM1oX
+DTQwMDkxODEyMzIxM1owGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
+BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAip5MBDd8vgTvs9n2egO7WrcekJu8
+oE1lc0S0mfKgJx8/B3L21p2AeNJ5bpCu1bfseMG+LGVk9Ak0gVw4bC3k1BDqgr9l
+XVoQsoBm9akJQkFE70Dn5YKp69ElZEK1lOW+sdOZ57ZYieUJ2EUQtwzuQraofARt
+giQOck8cQ1pMuWwGpt56FlQiIfte2eP3UFdosdO+HZovnuudC+FSmFs4fZK44nuL
+I4NIs6x5kMroMRPj28TZyiDFhqc5OacvTISqknIAZibEvVgWjwozUWHfZCxiz8jf
+myRDqxiHXrAw9OSweMhLYVtuvgMjinmLp1qKH8Xyo6zcbnugadSbiWtN+plGJOdD
+3H3mKSMGVBhC/fJ3IHLb8jNoM2F0fI1j+t5AAhXgmHrso1UCH51j2eKZCaEnco2A
+sFTJFQH1dx7z3vGBwbBGN40L2+E/9Muy4OhktTq5S8Q3FwSQKfL7gTsnGaEGVdAX
+Bd1GBBXmPSdDEoG4OD0uBrU9W4guqUsfhfKRAgMBAAGjZTBjMB0GA1UdDgQWBBTr
+BKReDs0/3v2lO20AjqHW/BvwRzBCBgNVHREEOzA5gg9pZHAtc2hpYi5zbHUuc2WG
+Jmh0dHBzOi8vaWRwLXNoaWIuc2x1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBgQBU9FjUNNd+j0zM0d5d8E7PaSBr2Ur6obOtRkK1OvgVXwzyVzLW
+F4Nt8wH1TnVoSYS7rkaaXfZyUxDdZidOX8vlY437C1VrJj1lhDfL+JyZWvP085v8
+37ayXrUbQZ0O8mI3y/JtvbnmvCaGACDHO1BdCNF0a7Grgnchx2LpFJBeeISiJDQA
+HQ/WWsWm55wBUKjOmSR1OwdpaqjhfEbSjz0EEwpvtpdhyOvhOmcRsUufyS1E1u3L
+i6MNP47jwhxYb5mSxS/ztV3bvVAESh6hzlgNUzvhfCkZqMvcYKbaOole6dNjK1mF
+Y3Dry6gqRyCsKHGJMm//vdtfLarTLv5y7H1ZHAGxRikyWS+Y/iziFPY2npJizkyI
+6HlPnaQZM1Vuy1Oreottr929cyUQqonWt6+b23G2WbAbOab9uKWPMLe4tOBiiDE7
+ujeic7u2uPDoyu8mYgS3r++bjQrfqRRo/wYI5VF/n3KSFkCXZPx3CxbkMJBG6JeA
+UgKStld+SURLHX8=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTAeFw0yMDA5MTgxMjMyMTRa
+Fw00MDA5MTgxMjMyMTRaMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAI+DF3Vz6IlU5hxi+a3718iunTb7
+otIKbB4q5xWeFOKawlzQ1yLHe1BoNAb7tMc2X07804OxZblqh3SEjBexPv9Of/7f
+iltbRWyKGskjqVyskxzuk/H2sv3j9jKF+umWvTjb4t4RDpLjagYWti35hOvBXM5A
+bTSphHapUIcEowaQ1echecNQUOoduqntM4mZzEAMCEdtoNk/Tx9fOoo2avvkKwBs
+6ITxAAe4FVReVR93o5vMTwkV1nbPniwqHYURivRhudg8z5Y3Eq3gvA4ZvWWUV0By
+UKVhdQ+1QVCjMTfmIbO3BS/nASreTWWzINtaU1bw8x5qnePRFwnBAtykoet0hexx
+HDL/v8n8HrMP8iG+ymWII0gfKq5pNuDf2yTpnxNkzW07JcJRaMIORy2dfts3VvpG
+8SlAT71k4F6aPIyNEVQwyaGvtcYVB8Lnr0DhXszrSlUCmRATepYHOZib06ieSph9
+wTxKMlcjFUCH/EAvLD4C/qF+NKgcsuFt5QHMTQIDAQABo2UwYzAdBgNVHQ4EFgQU
+lPxFc2SumHftUVBWOKqt5OaNJb8wQgYDVR0RBDswOYIPaWRwLXNoaWIuc2x1LnNl
+hiZodHRwczovL2lkcC1zaGliLnNsdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAYEACKA9LILXqOIYgumpfeohy8ft3l+h33NPGPuXXlViwm1v8uWo
+ACRvrARooOllmFaDJNrilHGSi34bYnLIeSpqhYzLc8tauTP/jwmHdq68WEQdC0s7
+uhC6O2JBdhgpUGXMpjuPuuwH6DdXHQymYMjGNDl4NUwl7N3Hod8sJjl30HpJ7f4/
+UV10MuCAh54MWeBHo2ooxEsgYU06qvkT+hO5tAtgR1vDHLoPBqMgPhY/PjsxF5WG
+SWe/AdSARRe4hxWBNwHSo1HlrpG/Gobhh/yluvSVLMd8BNdjKWWFaSwNCe0tw91U
+dt5jXfcmrDtr6sRuHoEmrm27lk9q4cj82Do1f5q79v51jYMtITNOpGZlx5Dskmgk
+cJo78+sWNUwKDrCtXE6e6hs8W/RD7VDZtP7OIvCVZpjCodjoiPdz8zOirIFcahPf
+jHiyDn2ImKKJdsVU8n21d7aEShNxDviRnRhiZaILmaqVZHvslZq32XNbgZTPySWL
+ffEVzH+iKOe5hd6R
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shib.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationName>
+    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">SLU</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SLU</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">https://www.slu.se</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://www.slu.se/en</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>IT Help Desk</GivenName>
+    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <GivenName>IT Help Desk</GivenName>
+    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>IT Help Desk</GivenName>
+    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
deleted file mode 100644
index 78440179..00000000
--- a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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://idp2-test.slu.se/idp/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>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
-        <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz
-WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU
-vpSFSPj5GTA706faG2cdT/uEj44nCt+fJKsQ+AxqcJNjXW/tTSsfMcpmqViX1Z0Q
-lQE0ZoBDZ1KcwSFNj3fak93qBaX5sw75PSgvcrRnTnGTw1wDiKE0Ke5CKFIAhSX4
-PN7kz0LSxYT4492IK/suDJHT3qw3EIAGRSCkUDgiq7V938M9ooY1RcEmEhRh2u9Y
-l+1vd3g3znos01Y9EBxH7/8QMSUiA17D9fLdv8Q3AfjU1wVrt/ZFfojU6MJdB4/5
-EIljjyb4c6qya6EC/ncFcBzERO/qkNKaPc9oZLykR61NgLfPJcbR/kHGmoFUzwID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAyLXRlc3Quc2x1LnNlhidodHRwczovL2lk
-cDItdGVzdC5zbHUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFqVAZevGJiv
-gszk7pbfb6vbVLwsMA0GCSqGSIb3DQEBBQUAA4IBAQCANZw9xmEFKJYgNyVAZuj7
-nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs
-oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS
-0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K
-YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
-6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-test.slu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-test.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz
-WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU
-vpSFSPj5GTA706faG2cdT/uEj44nCt+fJKsQ+AxqcJNjXW/tTSsfMcpmqViX1Z0Q
-lQE0ZoBDZ1KcwSFNj3fak93qBaX5sw75PSgvcrRnTnGTw1wDiKE0Ke5CKFIAhSX4
-PN7kz0LSxYT4492IK/suDJHT3qw3EIAGRSCkUDgiq7V938M9ooY1RcEmEhRh2u9Y
-l+1vd3g3znos01Y9EBxH7/8QMSUiA17D9fLdv8Q3AfjU1wVrt/ZFfojU6MJdB4/5
-EIljjyb4c6qya6EC/ncFcBzERO/qkNKaPc9oZLykR61NgLfPJcbR/kHGmoFUzwID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAyLXRlc3Quc2x1LnNlhidodHRwczovL2lk
-cDItdGVzdC5zbHUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFqVAZevGJiv
-gszk7pbfb6vbVLwsMA0GCSqGSIb3DQEBBQUAA4IBAQCANZw9xmEFKJYgNyVAZuj7
-nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs
-oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS
-0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K
-YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
-6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (test)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>SAML Admins</GivenName>
-    <EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>SAML Admins</GivenName>
-    <EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 356611df..f6e90fc9 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -16,7 +16,6 @@
   <xi:include href="swamid-2.0/ladok3test.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
@@ -60,4 +59,5 @@
   <xi:include href="swamid-2.0/nya-00.its.umu.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp-shibtest.slu.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp.vr.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idp-shib.slu.se-idp.xml"/>
 </EntitiesDescriptor>