Resolves SWAMIDOPS-8153

2 files changed, 143 insertions, 262 deletions

diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 958a4841..a36b1a75 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.mah.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.mah.se/idp/shibboleth">
+  <IDPSSODescriptor 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">mah.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Malmö högskola</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Malmö University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Malmö högskola</mdui:Description>
@@ -16,35 +16,84 @@
         <mdui:Keywords xml:lang="sv">mah malmo+hogskola malmo+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">mah malmo+hogskola malmo+university</mdui:Keywords>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>mah.se</mdui:DomainHint>
         <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
         <mdui:GeolocationHint>geo:55.608982,12.992469</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
-OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgaMWnEn2Fhn7xNG/PFpKOkACs3I9Rd2AspSE0NPD
-q3EuNx50kXrfeRxFsSntWy1PTQ8XYI1FONZx3l21CSmwsNSYa4coAsHC8U4yBN9b
-c1f/Q+7KQod+Q08cWJ75aiw0zvRl547bWfh0n5v1L21G+0fFUvY/6t5gN/HgHJZA
-9jZNZwVSzteivEmgooiJqXaUM7njWs15Ee1pTO6ib4w8eYj3AJuhWe58W3+Rc6xk
-5u5H/3LZiPMHiTnrqG2Ux+gFJStc5PXWO6NxiCOWtDufmJ6OcPrGkVMJ8LoZvQ1J
-OThRimq3OmaATe03wGqTRP3xHXqRSQPlXEIb86sSPnDU5wIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAubWFoLnNlhiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFHwHbhAp4egiLmh0CawPk430y+D8MA0GCSqGSIb3DQEB
-BQUAA4IBAQA0Hxjvk2Muuzwgyv8Nhvmeb43+qwvqIa+rCSJxZpEpR5xGyMLTApLL
-oRYlPGQIQUj8u8HFtcdRVmc/OWG0NhyBe9OiwFjcGlsdINZiyYm+4whwRrbt6/dn
-ykhKvjQMhX2x/0SjyrA/LjifpZB3VMN6qdRrGY082I7X5tZmmqyoWk/rED4WxL3u
-+j+6GUcWJOdPBAO4uBqUGzw9tvjXHE2nm5eQlKkk+138vFHkeb1fDrDthXuN9f03
-Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
-dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
-
-                    </ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
+MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
+HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
+A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
+PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
+9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
+/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
+DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
+a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
+uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
+JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
+LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
+jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
+MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
+2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
+WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
+Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
+oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
+1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
+DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
+PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
+UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
+74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
+t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
+2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
+MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
+DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
+PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
+Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
+PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
+ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
+HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
+ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
+mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
+Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
+eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
+Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
+7UutZmHR05RiErkouLWVildFWPkfDUIO
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -54,43 +103,88 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mah.se/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mah.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
+MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
+HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
+A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
+PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
+9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
+/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
+DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
+a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
+uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
+JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
+LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
+jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
-OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgaMWnEn2Fhn7xNG/PFpKOkACs3I9Rd2AspSE0NPD
-q3EuNx50kXrfeRxFsSntWy1PTQ8XYI1FONZx3l21CSmwsNSYa4coAsHC8U4yBN9b
-c1f/Q+7KQod+Q08cWJ75aiw0zvRl547bWfh0n5v1L21G+0fFUvY/6t5gN/HgHJZA
-9jZNZwVSzteivEmgooiJqXaUM7njWs15Ee1pTO6ib4w8eYj3AJuhWe58W3+Rc6xk
-5u5H/3LZiPMHiTnrqG2Ux+gFJStc5PXWO6NxiCOWtDufmJ6OcPrGkVMJ8LoZvQ1J
-OThRimq3OmaATe03wGqTRP3xHXqRSQPlXEIb86sSPnDU5wIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAubWFoLnNlhiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFHwHbhAp4egiLmh0CawPk430y+D8MA0GCSqGSIb3DQEB
-BQUAA4IBAQA0Hxjvk2Muuzwgyv8Nhvmeb43+qwvqIa+rCSJxZpEpR5xGyMLTApLL
-oRYlPGQIQUj8u8HFtcdRVmc/OWG0NhyBe9OiwFjcGlsdINZiyYm+4whwRrbt6/dn
-ykhKvjQMhX2x/0SjyrA/LjifpZB3VMN6qdRrGY082I7X5tZmmqyoWk/rED4WxL3u
-+j+6GUcWJOdPBAO4uBqUGzw9tvjXHE2nm5eQlKkk+138vFHkeb1fDrDthXuN9f03
-Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
-dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
-
-                    </ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
+MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
+2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
+WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
+Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
+oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
+1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
+DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
+PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
+UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
+74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
+t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
+2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
+MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
+DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
+PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
+Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
+PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
+ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
+HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
+ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
+mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
+Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
+eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
+Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
+7UutZmHR05RiErkouLWVildFWPkfDUIO
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.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>
     <OrganizationName xml:lang="en">MAH</OrganizationName>
diff --git a/swamid-2.0/ls00001.mah.se-idp-shibboleth.xml b/swamid-2.0/ls00001.mah.se-idp-shibboleth.xml
deleted file mode 100644
index c0ac97eb..00000000
--- a/swamid-2.0/ls00001.mah.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://ls00001.mah.se/idp/shibboleth">
-  <IDPSSODescriptor 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">mah.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Malmö högskola *TEST*</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Malmö University *TEST*</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Malmö högskola *TEST*</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Malmö University *TEST*</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.mah.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mah.se/english</mdui:InformationURL>
-        <mdui:Logo height="195" width="132">http://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="195" width="132">http://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="195" width="132">http://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">mah malmo+hogskola malmo+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">mah malmo+hogskola malmo+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:55.608982,12.992469</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
-MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
-HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
-A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
-PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
-9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
-/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
-a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
-uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
-JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
-LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
-jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
-MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
-2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
-WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
-Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
-oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
-1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
-DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
-PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
-UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
-74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
-t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
-2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
-MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
-DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
-PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
-Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
-PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
-ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
-HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
-ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
-mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
-Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
-eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
-Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
-7UutZmHR05RiErkouLWVildFWPkfDUIO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00001.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00001.mah.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://ls00001.mah.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00001.mah.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00001.mah.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
-MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
-HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
-A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
-PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
-9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
-/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
-a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
-uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
-JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
-LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
-jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
-MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
-2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
-WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
-Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
-oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
-1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
-DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
-hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
-PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
-UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
-74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
-t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
-2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
-MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
-DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
-PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
-Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
-PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
-ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
-HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
-ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
-mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
-Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
-eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
-Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
-7UutZmHR05RiErkouLWVildFWPkfDUIO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00001.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MAH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Malmö högskola *TEST*</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Malmö University *TEST*</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Malmö University</Company>
-    <SurName>IT Drift</SurName>
-    <EmailAddress>mailto:drift@mah.se</EmailAddress>
-    <TelephoneNumber>+46 709 655480</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Malmö University</Company>
-    <SurName>Robert Faling</SurName>
-    <EmailAddress>mailto:robert.faling@mah.se</EmailAddress>
-    <TelephoneNumber>+46 768 428753</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Malmö University</Company>
-    <SurName>Servicedesk Malmö högskola</SurName>
-    <EmailAddress>mailto:support@mah.se</EmailAddress>
-    <TelephoneNumber>+46 40 6657555</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>