sunet idp

17 files changed, 739 insertions, 46 deletions

diff --git a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..73c08538
--- /dev/null
+++ b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://emrex-test.its.umu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://emrex-test.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://emrex-test.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">EMREX testmiljö</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">EMREX test site</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">EMREX-projektet stödjer EU:s mål för 2020 att 20% av högskolestuderande ska kunna vara mobila under studietiden.</mdui:Description>
+        <mdui:Description xml:lang="en">The EMREX project addresses the EU 2020 target that 20% of higher education students should be mobile during their studies.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>emrex-test.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=emrex-test.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEBjCCAm6gAwIBAgIJAIDSDgbd4S8GMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFWVtcmV4LXRlc3QuaXRzLnVtdS5zZTAeFw0xNjEyMDYwODQxMjRaFw0yNjEy
+MDQwODQxMjRaMCAxHjAcBgNVBAMTFWVtcmV4LXRlc3QuaXRzLnVtdS5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMISmqRRw7Z7Jl8zgifKchPe75YW
+F1rotDpk3zWzntGgjiyuCQitYVJMgNUxKw0+zATnRKpInMuvJC6fPbFHQBlUcIYJ
+plzyPiIA5p+C1YpGuFLhO+rWyVar1lqPJttzd9wVfDfK2nhYM9EshBGd5Kt2/sEU
+xs0pcadGs7JDRe5XOZ8kIES+cQo1BWc/KheCdfZsj2jw6rx55PXvoZuTQdVRi53M
+ikxLqwWoG3U/G24MR9otSibQVi9k0/tLXmrz//L1S6lc4DPzy0WAxVQQf/JejfAb
+dAL4p7P/uwBhioQsYa/ZgT5eDMkLUQAZlAnCILFR0rFlvr3SOaqXPQvs4yrMJF52
+XiAeuCw8L0eYCocTZUXEyYe3g4+sy41DNjTiVZp5i7+blh/EEm8Gp/1A24Saurf2
+F4LAmndStnN3nIQZguXBWQAaCOB/svI3xUnOwMTOTWj7rb5HSxee6NHfOBrT1/7N
+4fh2sLjuzEiPLdJ7JWCdXxIez4zHWajkO2CrOQIDAQABo0MwQTAgBgNVHREEGTAX
+ghVlbXJleC10ZXN0Lml0cy51bXUuc2UwHQYDVR0OBBYEFMKf6PieEXQfy9QPuHfO
+AO8LIaIZMA0GCSqGSIb3DQEBCwUAA4IBgQBKFUjn9opTObvtHF4Kd8heq1OjAe6w
+u8HIkMbPCN/ROgDU13lG9zHirmbHVyxElHwgatTTX7TdvRPnqCfbN/GglVWfne0X
+LKo+EJLk06aoOL6NJ63wTnP46mYDBJkmVgLziskvXQoNu3C84CfX8QsOpHmrk3/V
+O4MqfJ5qyW/kAeiVfzfH+NSou2bCmk5ceL3OYAwkH3n7Z5paUkbEiZZN5BI9TF/Y
+HrhzaeTIXQH2CebE/9SFILY0s2M2DIfy1GWW7SDB8ZgPpb05yyVVVJ3s/5q+hdI9
+aWn+LGDbaCHZzuPd+JiCj34q/tEc2pWQ9iDOkbVAsgfz9bi0LcM8oyvNTkejZjPg
+AUxjAGwUlgfnDIx5RE4MxfDXNqPvGfQ1kQBhF54pmKZs1q8BF4ViVLo5KEBlwyg/
+wgPS44zDX5XafAC2Xo1uMaV/tAoFWGq4NnLQ5F1td1pl3fLXLFZu7sI6uYKi9sfk
+Rh2KVHAiKOIu9nyDsz3aAY17J2ju15aJRQc=
+</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://emrex-test.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex-test.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Risto</md:GivenName>
+    <md:SurName>Järvi</md:SurName>
+    <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
index 424040df..e14150ac 100644
--- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
@@ -1,12 +1,19 @@
 <?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://idp.hh.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
   <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">hh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad (ny v3)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad - new</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Halmstad University (new v3)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Halmstad University - new</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
       </mdui:UIInfo>
     </Extensions>
@@ -176,8 +183,8 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad (ny v3)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Halmstad University (new v3)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad - new</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Halmstad University - new</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..5271ecf2
--- /dev/null
+++ b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
@@ -0,0 +1,216 @@
+<?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://idp.ltu.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+      <saml:Attribute 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>
+    </attr:EntityAttributes>
+  </Extensions>
+  <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">ltu.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>ltu.se</mdui:DomainHint>
+        <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUEF1BMNIKMVmOiuK2uUY7yMT/FZEwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLmx0dS5zZTAeFw0xNjEwMDMxMDU0NDRaFw0zNjEw
+MDMxMDU0NDRaMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC77HPEN3ywPEqpkuv92tbanirV61gX3Eg9LFBPGhXM
+zy4x3RiYAVnBssXYFrL6OKKzOpilNVJnzTFWYzSE8uc6wHBI4YDn9K57cwyDeUWx
+jaG/vK36lu1Z33pCqJlE7f1Ucs+wDTzks7RnM0l5mdaeENG7PXullEgArBS6oRAb
+VnBnBJImh8ZaNpNuVMcBc+sC/sL7jsVr3OI7I6/Wya8YLKbADLdVw5R+nuI3wVsz
+EUccXz2j0/BpvlqzlX12wdHMY9+nKWXNQPRfPeHWFlvV6qZBk6DbUZgsUmZKus+w
+cnfShcWyOTUtfL6N4PDJEasO7KBVdbFrWwLNQey4q+CHAgMBAAGjWzBZMB0GA1Ud
+DgQWBBQjfk7uz/iBRZnn4KuPLDzGROENzDA4BgNVHREEMTAvggppZHAubHR1LnNl
+hiFodHRwczovL2lkcC5sdHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGJWdP5TL1b89e8ZPzB5EhZXTepmmMzORQ7RHy/Ud7xd7yrnqg3JRiwq
+wOWcty/UyZQpxHZucSXumj11iSeIY8FQ+hH0IusDg32esITifj67nNZaWsY7KPVg
+IPq41WLphw/6UPHBtv3KkG3dwhx7ZglIc1uf904zLZyl5W5t4KSSues7E9yWcURV
+QbftDOzCzlTCiqH4LAOrNzY5T03E/NzoDCynKGpML+KLHqH8yCFHzpPzXopprG+f
+1aH7y6eF6sFdeeD7xbvPNNqRF1dLIz2N997LrmEjLQGRUPhCeaXo0kNMDxzJMbAc
+Imrso4dObDk/xFdJSbWgmKWEnvUc2+o=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOGyXLVRoSiwOvBslVqyO8H8MUpkMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQzWhcNMzYx
+MDAzMTA1NDQzWjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAi1hFx0uyuGSOAI4syizgW1tHwR5mtSrzmeNDBFYM
+uWvpfY24eWypO2cmugbSt/M8wvzwYE8BhXQo8BztRTgCLsreR7pS3IT9ZAERrZnA
+b22cMKnJ6+b7IaGeHHBjuw5d74N/gtEhaRmj7aFcpSxk6g2SdGw7FpxRWOErZQMG
+zFmoSoR5vWl/k/eOc/N5iW5797CVJ6Ip5UB0IbFVZ4wWb2q2y3G0kBY//Hl3KKhp
+OnoOeXnSYSieT8BbCUv4249xOBFmI0Cg65q69Pz+c/8oEX4YUBA9jyhD2FiKKFyG
+ofo8BUv/f7Q6P5CgrXATbFaeOGI3Ps+JVB6mZ1NEUy+QAwIDAQABo1swWTAdBgNV
+HQ4EFgQUDhxowmARcpr57XwHEI4Y3UyVYmQwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
+ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQADhDlm/9jU3jn49SjTtYbvBCvGj4pQXit0m0uRo6nFpYK3IZFTlUA6
+/CETpDGBJCnq6N6BHH+BrIb3mVXLywTsose0D+aDuI6EjaNWFQzOkH04Vm5VOLA0
+olQ/A1/53G6ibw7zQM7G9luRuE9NsIlUp40+XmSkZAb+ywaPG74OHJo2FzIbwC20
++donlVlCl22RG0hRqoyKRjFaDr6wskvw5kXqqjcnCyEp81HiJHu9DefFiKSy7knQ
+ZVSpDwl0ijbRGFwWRPYwOf+M2H8b49UKq3D0nhXRhynPP+txW7xwFg4gIsqg4kgC
+X4dei9FUiIpNKgYziKf/tzbvJQqiV18l
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAJtIqlatDGFOju804cuPymREGdCnMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQ0WhcNMzYx
+MDAzMTA1NDQ0WjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEApssNdGrdf68j/MkcesycaSHS09IOOJOfvKAMsTS3
+tqurFc5Jebxiu+uoHm5pDqXcrDxquJxFVvD7HJhPsR0yMm85/7bt9NkmQssqqMQ7
+GTX1WnrJa1STaZO/izcJcOw7vXJ89c3DevszGZqZGAiImzpiX2N5T9Xl1OtckOrG
+pX/2aXZg6TATC0Q/lAa9u/GBYvuCZ/hlUKfyjzIAkIXms/w8bZu7EAb2tIipGoVO
+dfvsW/3LtA7tnYDNrK0ZyhgCSDiu7L6bfGcLlMsJNCNmGbRsVkkx5L7Di9KI9WD2
+cfnmuPMQLu/C9F3lGcfRg05yZSFrA0TgZ9xFeB8cq/H5dwIDAQABo1swWTAdBgNV
+HQ4EFgQUAjMKyo3f4aK/PsMfBg4Z5ybxg1wwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
+ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQAATNstFYSsUkvum8FSaX5ocJwTxuiH1kNM/ZHhEWeT6/iWHnLhu7Ny
+TmDtc3WkxSMtJ3sk6JXr+SHKCMdDoFhUH2R/djGEnjLURtMLhEeMIEIk3tY3v4cO
+7SoVlJMf+3olbpvWzd9DzkONU9U/CcY6si0FWXFnzWkkJOzCdJcvIpY2eQ5ToBvr
+uowwVDOkLMkwJEKleCa0iFm6oRGmGOGavnymCFZSG2BCikRllS5J0j0Pj3ZYwc5p
+MfScMYUVxXQNrKv/yODSBaeDgqvxmTzKjSyNUShynz+WXbFOxV/HlCKtaaZNh2Zv
+ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ltu.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://idp.ltu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ltu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUEF1BMNIKMVmOiuK2uUY7yMT/FZEwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLmx0dS5zZTAeFw0xNjEwMDMxMDU0NDRaFw0zNjEw
+MDMxMDU0NDRaMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC77HPEN3ywPEqpkuv92tbanirV61gX3Eg9LFBPGhXM
+zy4x3RiYAVnBssXYFrL6OKKzOpilNVJnzTFWYzSE8uc6wHBI4YDn9K57cwyDeUWx
+jaG/vK36lu1Z33pCqJlE7f1Ucs+wDTzks7RnM0l5mdaeENG7PXullEgArBS6oRAb
+VnBnBJImh8ZaNpNuVMcBc+sC/sL7jsVr3OI7I6/Wya8YLKbADLdVw5R+nuI3wVsz
+EUccXz2j0/BpvlqzlX12wdHMY9+nKWXNQPRfPeHWFlvV6qZBk6DbUZgsUmZKus+w
+cnfShcWyOTUtfL6N4PDJEasO7KBVdbFrWwLNQey4q+CHAgMBAAGjWzBZMB0GA1Ud
+DgQWBBQjfk7uz/iBRZnn4KuPLDzGROENzDA4BgNVHREEMTAvggppZHAubHR1LnNl
+hiFodHRwczovL2lkcC5sdHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGJWdP5TL1b89e8ZPzB5EhZXTepmmMzORQ7RHy/Ud7xd7yrnqg3JRiwq
+wOWcty/UyZQpxHZucSXumj11iSeIY8FQ+hH0IusDg32esITifj67nNZaWsY7KPVg
+IPq41WLphw/6UPHBtv3KkG3dwhx7ZglIc1uf904zLZyl5W5t4KSSues7E9yWcURV
+QbftDOzCzlTCiqH4LAOrNzY5T03E/NzoDCynKGpML+KLHqH8yCFHzpPzXopprG+f
+1aH7y6eF6sFdeeD7xbvPNNqRF1dLIz2N997LrmEjLQGRUPhCeaXo0kNMDxzJMbAc
+Imrso4dObDk/xFdJSbWgmKWEnvUc2+o=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOGyXLVRoSiwOvBslVqyO8H8MUpkMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQzWhcNMzYx
+MDAzMTA1NDQzWjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAi1hFx0uyuGSOAI4syizgW1tHwR5mtSrzmeNDBFYM
+uWvpfY24eWypO2cmugbSt/M8wvzwYE8BhXQo8BztRTgCLsreR7pS3IT9ZAERrZnA
+b22cMKnJ6+b7IaGeHHBjuw5d74N/gtEhaRmj7aFcpSxk6g2SdGw7FpxRWOErZQMG
+zFmoSoR5vWl/k/eOc/N5iW5797CVJ6Ip5UB0IbFVZ4wWb2q2y3G0kBY//Hl3KKhp
+OnoOeXnSYSieT8BbCUv4249xOBFmI0Cg65q69Pz+c/8oEX4YUBA9jyhD2FiKKFyG
+ofo8BUv/f7Q6P5CgrXATbFaeOGI3Ps+JVB6mZ1NEUy+QAwIDAQABo1swWTAdBgNV
+HQ4EFgQUDhxowmARcpr57XwHEI4Y3UyVYmQwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
+ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQADhDlm/9jU3jn49SjTtYbvBCvGj4pQXit0m0uRo6nFpYK3IZFTlUA6
+/CETpDGBJCnq6N6BHH+BrIb3mVXLywTsose0D+aDuI6EjaNWFQzOkH04Vm5VOLA0
+olQ/A1/53G6ibw7zQM7G9luRuE9NsIlUp40+XmSkZAb+ywaPG74OHJo2FzIbwC20
++donlVlCl22RG0hRqoyKRjFaDr6wskvw5kXqqjcnCyEp81HiJHu9DefFiKSy7knQ
+ZVSpDwl0ijbRGFwWRPYwOf+M2H8b49UKq3D0nhXRhynPP+txW7xwFg4gIsqg4kgC
+X4dei9FUiIpNKgYziKf/tzbvJQqiV18l
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAJtIqlatDGFOju804cuPymREGdCnMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5sdHUuc2UwHhcNMTYxMDAzMTA1NDQ0WhcNMzYx
+MDAzMTA1NDQ0WjAVMRMwEQYDVQQDDAppZHAubHR1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEApssNdGrdf68j/MkcesycaSHS09IOOJOfvKAMsTS3
+tqurFc5Jebxiu+uoHm5pDqXcrDxquJxFVvD7HJhPsR0yMm85/7bt9NkmQssqqMQ7
+GTX1WnrJa1STaZO/izcJcOw7vXJ89c3DevszGZqZGAiImzpiX2N5T9Xl1OtckOrG
+pX/2aXZg6TATC0Q/lAa9u/GBYvuCZ/hlUKfyjzIAkIXms/w8bZu7EAb2tIipGoVO
+dfvsW/3LtA7tnYDNrK0ZyhgCSDiu7L6bfGcLlMsJNCNmGbRsVkkx5L7Di9KI9WD2
+cfnmuPMQLu/C9F3lGcfRg05yZSFrA0TgZ9xFeB8cq/H5dwIDAQABo1swWTAdBgNV
+HQ4EFgQUAjMKyo3f4aK/PsMfBg4Z5ybxg1wwOAYDVR0RBDEwL4IKaWRwLmx0dS5z
+ZYYhaHR0cHM6Ly9pZHAubHR1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQAATNstFYSsUkvum8FSaX5ocJwTxuiH1kNM/ZHhEWeT6/iWHnLhu7Ny
+TmDtc3WkxSMtJ3sk6JXr+SHKCMdDoFhUH2R/djGEnjLURtMLhEeMIEIk3tY3v4cO
+7SoVlJMf+3olbpvWzd9DzkONU9U/CcY6si0FWXFnzWkkJOzCdJcvIpY2eQ5ToBvr
+uowwVDOkLMkwJEKleCa0iFm6oRGmGOGavnymCFZSG2BCikRllS5J0j0Pj3ZYwc5p
+MfScMYUVxXQNrKv/yODSBaeDgqvxmTzKjSyNUShynz+WXbFOxV/HlCKtaaZNh2Zv
+ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">LTU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Lulea University of Technology</Company>
+    <SurName>LTU Servicedesk</SurName>
+    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
+    <TelephoneNumber>+46 920 491664</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Lulea University of Technology</Company>
+    <SurName>LTU Servicedesk</SurName>
+    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
+    <TelephoneNumber>+46 920 491664</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Lulea University of Technology</Company>
+    <SurName>LTU Servicedesk</SurName>
+    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
+    <TelephoneNumber>+46 920 491664</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
new file mode 100644
index 00000000..264e7f70
--- /dev/null
+++ b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
@@ -0,0 +1,204 @@
+<?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://idp3.sics.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns="" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
+  <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">sics.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SICS new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SICS ny</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
+        <mdui:Logo height="95" width="328">https://www.sics.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>sics.se</mdui:DomainHint>
+        <mdui:DomainHint>tii.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.64.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.135.0/24</mdui:IPHint>
+        <mdui:IPHint>192.71.100.0/25</mdui:IPHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUC8ZzxgX88gmX3pubdJieGlep18EwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMB4XDTE2MTEyODEzMjgzN1oXDTM2
+MTEyODEzMjgzN1owFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlezQ/dCnV44kDRGIcnGWu/Gzqhl0aI80CSDG
+B8jdU1x5aZGJdJhOBO5FZfnWPFJ/14dYxrdS5rCOjMwYA7kRAidRaPxjcQ7Pstxi
+mVO1FeBP9Kt0cHA/b5BDPF6g8gixiRdBELSAUS+GWEBAetgZR2er7QHtDSygsufA
+hhJkt+LAL8XHtZevVcQQwzQk0ITOdSIK0PgoSxEz2+08PuSAl13XvG843/KB03H2
+NOaQZ8tXh+AIEZsGbVkFCGm+NaiJfhVkeTNKWXC8TdeEZgxtm5ecpiK1N/y9g1Ol
+BxHMxhg+xNmNtVii8BkxL2FvpNm2S2wy4FYqA0oIz6vaa4BsewIDAQABo18wXTAd
+BgNVHQ4EFgQUPWTubAomN3Z80fGId/8Rgca3x5UwPAYDVR0RBDUwM4IMaWRwMy5z
+aWNzLnNlhiNodHRwczovL2lkcDMuc2ljcy5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
+hkiG9w0BAQsFAAOCAQEAjJKinRix2Pb7l0FSnvnTln8zZHznBillPTvhKRmo5Zv7
+s7XZcX2UmP3CExWJmqxknjuYN6HTrJd94bCMqd/MJsVL4v6ro4KPT/IHSsxoPDXk
+tPi4xnXPnn6MdDbhp+O5jKvwB0lHSrn5TYZFdCPHReBeEF2eZi3vUP9s0m6O0wmx
+qu+TZVdcmm1+GkRpaz764d8bdmxb29QF9x/TGb3Wd7q97UVe9wmnbJlg5rvqD6cu
++M0ouU0DvGSq9Q8MGs7QS0kbMFDfgU8ttt32G4C2if26pQ2M/NPFnNQxEahcq/JH
+XjXWpnosUyFK8+P4sSS8WbkOjRMigBdgJ77/O9kgMg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAIbk/AWyGuLfop0aIdvjRPUe+JD0MA0GCSqGSIb3DQEB
+CwUAMBcxFTATBgNVBAMMDGlkcDMuc2ljcy5zZTAeFw0xNjExMjgxMzI4MzZaFw0z
+NjExMjgxMzI4MzZaMBcxFTATBgNVBAMMDGlkcDMuc2ljcy5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKQl5AmQquwVSOgxLy0qTAXuE6SxpVzOzBnw
+tZovDhAOzt1o53gJCErIkcNCkKJ2iF001w9h3BQhFgQappJQcBCBjkLoEErndqTB
+OMjMMZD8veCOl9eRhOc+xtN67cehdcq4mjoPErBkz/QfqJ+R9csrmPbSsGrSgsM8
+Li8haFNBClYVes2TRTc8/BqA3Ox7c+FTRpwccq6P7f9pLLdy8IwcO909TPce7lnd
+/ml0WIaJEa9drmLu7pq6IHHrjMaz9h83CfkalkHHg6iwqelXlB9YlF/F4QLRPYgy
+6g3mApmG4IYlqCney2uOK9o21f+NGO6mPH3LKZRlC/bZW9wjybkCAwEAAaNfMF0w
+HQYDVR0OBBYEFPu0PPX5wVA2Rh+P9Y92RYCeXcgMMDwGA1UdEQQ1MDOCDGlkcDMu
+c2ljcy5zZYYjaHR0cHM6Ly9pZHAzLnNpY3Muc2UvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQELBQADggEBAGunL364OPOsc8fulz7iGtdzddv9Vbu7VPn0aL9oAtnR
+Oyl3PqMTUV/9gew+JveBmWERQuIDq2WRnxOGbWuumTr2JhQwTRRRVM61NQB3GBEp
+qii769ErnWDv/TzR5GkXDq5jj/LUnCLWcFaFAvNTmA0GqB3+FUCSh6vxWfFVOIQl
+s8qm/RieXxph4QZYfB7uok4xW+j0pd7Pm6oLEzQEHWiCvboZqdd6kVW0toeUHTkr
+HN309Sg8tYO0Q7Fm/aDKo8SWb362vdt2vaNPch9lPqKjrgBLG01N+SGsaBR0/2Pe
+SBMOVf6ihadT7xpAkg5/54jKsGzzRVU/IQSAXZ2L4r8=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIULL1bBn84IXCkbt9QgtBGEkp2jUIwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMB4XDTE2MTEyODEzMjgzNloXDTM2
+MTEyODEzMjgzNlowFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6v4umDC42Fl4/E7AYKyLrSxs9e7R9G19/ys
+x9iblYXS4M7aLx9T0jqXDQYa5vm8rTwGyGLiXxYLDIWlZ9iyByXC3QIbw4ykqJSz
+N8Hk4ridBk4B6B/3vhJYO7oAdHJe/l9GEPzrHtJK9J9lcbgLsdTtvz+OZs0SywJr
+v0N5carmnJeBstj2JFQx+/skAgEHxuBSe9mDMZQP7FqQ9cs+fTZ0txrdzhyx5ocp
+9PoLRz9i4Te1hA4Em0KPkqp5kLALZhX0L87HgBLS+WN9qR/k/UNddokoZIxGtfdX
+F7x+ryfFzCEzxXnZz+4ESU9met6sL3pLXX88qrmav83jzj4V+wIDAQABo18wXTAd
+BgNVHQ4EFgQUxVp9OoGrl3HXINzLYRgGm2rsvRIwPAYDVR0RBDUwM4IMaWRwMy5z
+aWNzLnNlhiNodHRwczovL2lkcDMuc2ljcy5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
+hkiG9w0BAQsFAAOCAQEAPi9sRmPW2DizezM7xU9aEwIp/0sOM0LHWp/K87MQ+1GZ
+SAOCqLPw6EidwemfKIM8x6I0iOPNT6hnBLvdNqMQWZb7LmffWAp0+yg5QClRZBCu
+snECvQvDp+te3eSg2dWrBz+adF0/7Zwz587EyIovAJWjuwVoSwvYshAxBS6DyydF
+o78+dmpzJCtKj8gSMY197trQPbtTjJYkNtfzrpWWbz6jd5ThsGEw4fOz7PGmeqYP
+CpX8lDxw16R2Cci/NOX9AYhtd+gDSQ9tcqqVLI+FLsplcTqzjaStBNnXulH/ufjy
+RSPI3dYXTAE9qA5awk/PGw+gfj7d8mqBUfuSj+KU4A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.sics.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.sics.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://idp3.sics.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.sics.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.sics.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sics.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUC8ZzxgX88gmX3pubdJieGlep18EwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMB4XDTE2MTEyODEzMjgzN1oXDTM2
+MTEyODEzMjgzN1owFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlezQ/dCnV44kDRGIcnGWu/Gzqhl0aI80CSDG
+B8jdU1x5aZGJdJhOBO5FZfnWPFJ/14dYxrdS5rCOjMwYA7kRAidRaPxjcQ7Pstxi
+mVO1FeBP9Kt0cHA/b5BDPF6g8gixiRdBELSAUS+GWEBAetgZR2er7QHtDSygsufA
+hhJkt+LAL8XHtZevVcQQwzQk0ITOdSIK0PgoSxEz2+08PuSAl13XvG843/KB03H2
+NOaQZ8tXh+AIEZsGbVkFCGm+NaiJfhVkeTNKWXC8TdeEZgxtm5ecpiK1N/y9g1Ol
+BxHMxhg+xNmNtVii8BkxL2FvpNm2S2wy4FYqA0oIz6vaa4BsewIDAQABo18wXTAd
+BgNVHQ4EFgQUPWTubAomN3Z80fGId/8Rgca3x5UwPAYDVR0RBDUwM4IMaWRwMy5z
+aWNzLnNlhiNodHRwczovL2lkcDMuc2ljcy5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
+hkiG9w0BAQsFAAOCAQEAjJKinRix2Pb7l0FSnvnTln8zZHznBillPTvhKRmo5Zv7
+s7XZcX2UmP3CExWJmqxknjuYN6HTrJd94bCMqd/MJsVL4v6ro4KPT/IHSsxoPDXk
+tPi4xnXPnn6MdDbhp+O5jKvwB0lHSrn5TYZFdCPHReBeEF2eZi3vUP9s0m6O0wmx
+qu+TZVdcmm1+GkRpaz764d8bdmxb29QF9x/TGb3Wd7q97UVe9wmnbJlg5rvqD6cu
++M0ouU0DvGSq9Q8MGs7QS0kbMFDfgU8ttt32G4C2if26pQ2M/NPFnNQxEahcq/JH
+XjXWpnosUyFK8+P4sSS8WbkOjRMigBdgJ77/O9kgMg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAIbk/AWyGuLfop0aIdvjRPUe+JD0MA0GCSqGSIb3DQEB
+CwUAMBcxFTATBgNVBAMMDGlkcDMuc2ljcy5zZTAeFw0xNjExMjgxMzI4MzZaFw0z
+NjExMjgxMzI4MzZaMBcxFTATBgNVBAMMDGlkcDMuc2ljcy5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKQl5AmQquwVSOgxLy0qTAXuE6SxpVzOzBnw
+tZovDhAOzt1o53gJCErIkcNCkKJ2iF001w9h3BQhFgQappJQcBCBjkLoEErndqTB
+OMjMMZD8veCOl9eRhOc+xtN67cehdcq4mjoPErBkz/QfqJ+R9csrmPbSsGrSgsM8
+Li8haFNBClYVes2TRTc8/BqA3Ox7c+FTRpwccq6P7f9pLLdy8IwcO909TPce7lnd
+/ml0WIaJEa9drmLu7pq6IHHrjMaz9h83CfkalkHHg6iwqelXlB9YlF/F4QLRPYgy
+6g3mApmG4IYlqCney2uOK9o21f+NGO6mPH3LKZRlC/bZW9wjybkCAwEAAaNfMF0w
+HQYDVR0OBBYEFPu0PPX5wVA2Rh+P9Y92RYCeXcgMMDwGA1UdEQQ1MDOCDGlkcDMu
+c2ljcy5zZYYjaHR0cHM6Ly9pZHAzLnNpY3Muc2UvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQELBQADggEBAGunL364OPOsc8fulz7iGtdzddv9Vbu7VPn0aL9oAtnR
+Oyl3PqMTUV/9gew+JveBmWERQuIDq2WRnxOGbWuumTr2JhQwTRRRVM61NQB3GBEp
+qii769ErnWDv/TzR5GkXDq5jj/LUnCLWcFaFAvNTmA0GqB3+FUCSh6vxWfFVOIQl
+s8qm/RieXxph4QZYfB7uok4xW+j0pd7Pm6oLEzQEHWiCvboZqdd6kVW0toeUHTkr
+HN309Sg8tYO0Q7Fm/aDKo8SWb362vdt2vaNPch9lPqKjrgBLG01N+SGsaBR0/2Pe
+SBMOVf6ihadT7xpAkg5/54jKsGzzRVU/IQSAXZ2L4r8=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIULL1bBn84IXCkbt9QgtBGEkp2jUIwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMB4XDTE2MTEyODEzMjgzNloXDTM2
+MTEyODEzMjgzNlowFzEVMBMGA1UEAwwMaWRwMy5zaWNzLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6v4umDC42Fl4/E7AYKyLrSxs9e7R9G19/ys
+x9iblYXS4M7aLx9T0jqXDQYa5vm8rTwGyGLiXxYLDIWlZ9iyByXC3QIbw4ykqJSz
+N8Hk4ridBk4B6B/3vhJYO7oAdHJe/l9GEPzrHtJK9J9lcbgLsdTtvz+OZs0SywJr
+v0N5carmnJeBstj2JFQx+/skAgEHxuBSe9mDMZQP7FqQ9cs+fTZ0txrdzhyx5ocp
+9PoLRz9i4Te1hA4Em0KPkqp5kLALZhX0L87HgBLS+WN9qR/k/UNddokoZIxGtfdX
+F7x+ryfFzCEzxXnZz+4ESU9met6sL3pLXX88qrmav83jzj4V+wIDAQABo18wXTAd
+BgNVHQ4EFgQUxVp9OoGrl3HXINzLYRgGm2rsvRIwPAYDVR0RBDUwM4IMaWRwMy5z
+aWNzLnNlhiNodHRwczovL2lkcDMuc2ljcy5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
+hkiG9w0BAQsFAAOCAQEAPi9sRmPW2DizezM7xU9aEwIp/0sOM0LHWp/K87MQ+1GZ
+SAOCqLPw6EidwemfKIM8x6I0iOPNT6hnBLvdNqMQWZb7LmffWAp0+yg5QClRZBCu
+snECvQvDp+te3eSg2dWrBz+adF0/7Zwz587EyIovAJWjuwVoSwvYshAxBS6DyydF
+o78+dmpzJCtKj8gSMY197trQPbtTjJYkNtfzrpWWbz6jd5ThsGEw4fOz7PGmeqYP
+CpX8lDxw16R2Cci/NOX9AYhtd+gDSQ9tcqqVLI+FLsplcTqzjaStBNnXulH/ufjy
+RSPI3dYXTAE9qA5awk/PGw+gfj7d8mqBUfuSj+KU4A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SICS ny</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SICS new</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">SICS ny</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>SICS</Company>
+    <SurName>CRIT</SurName>
+    <EmailAddress>mailto:crit@sics.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
index edfd8d97..96c94688 100644
--- a/swamid-2.0/indico.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth.xml
@@ -17,11 +17,18 @@
     <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://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <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://indico.uu.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://indico.uu.se/Sh ibboleth.sso/Login" 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://indico.uu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
diff --git a/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
new file mode 100644
index 00000000..9bfc1afd
--- /dev/null
+++ b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3.ladok.umu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <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://ladok3.ladok.umu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Inloggning Ladok3-utveckling</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok3 development login</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Inloggning mot Ladok3:s utveckling</mdui:Description>
+        <mdui:Description xml:lang="en">Login to Ladok3 development</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ladok3-build</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-build</ds:X509SubjectName>
+          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAL8Ubixr+su9MA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDGxhZG9rMy1idWlsZDAeFw0xNzAxMDkwOTQ3MjlaFw0yNzAxMDcwOTQ3Mjla
+MBcxFTATBgNVBAMTDGxhZG9rMy1idWlsZDCCAaIwDQYJKoZIhvcNAQEBBQADggGP
+ADCCAYoCggGBAP4Bh6hmPdBoFcrUKJNFzirwb9MlWtzWyCyeShjVaAkNVb9L62Rb
+owvWEtsrm1FFzvad2idZ6U6vrDCaE/EZSyDjmqmokRrLaN81NKRc+wKwMnZPlXPN
+sYo8hHebmR3BE/gWrb6Yp8X7IUqC4d/KSfagp0O7q1ma4Y/JjdSmUZjPYs9HJUf8
+D4BvM+XuXm3uF6qtR5AOUJl0PD/X0XW5jZ8BV00mOEjS7fpAM11tdaRXd/4JW1gW
+Zpx6gGTSSz1zkgbjG9PrxuNKFhAd1xXVs7aukpRiA5xQG5thUbpmy/qjNobqi8di
+XMBbmGiNLaec4RMpjUkqgnz9j0wT5wsps0MPKeNDafpbMNL5pBIGiu+fupefjj30
+S3xwvKYAeL2BUdFe43GTD6VZWpp6iEkwVmW0nbSFfXI7KLmwjvwyZhvdRHTko7hA
+fAAEcfi0W4FclIulYYHiMdmaZ1A/5EmAn9SSCbb2HKtnpdVQPxjk2wK2fP26qzJf
+yeNkz1K7Kn3XCQIDAQABozowODAXBgNVHREEEDAOggxsYWRvazMtYnVpbGQwHQYD
+VR0OBBYEFLtSHCdVOUiQMM3YqKApkcClmHY7MA0GCSqGSIb3DQEBCwUAA4IBgQD3
+pTC2gQkQxs708EKJn/UgF/4gDc9yEYAv4rQkZCUTc/jtkoyHklIxKHL+VJOCGBaC
+7ksZZCGFJNuiZqAcyRoFDkmyG/lx9Y2QSvHjMpDS4nxS0KfaYYYpD3MZG+cz0nw6
+f5VaDBDnZPLsdIfknW5x+QDDASL0VpfwVA5g/jIyH3cORzeI31bsl9Ppu4ephbdo
+Oo30VEwbP4aMnBh3RKX6RORiSMqXO6cEFS77wDuvP043LePDeojlEzn+nOPrTvhS
+LFYSvmSLEOGjDLZYqH6MqNXlHPvI9bYdYzUdyCn79MyhZgWTp5GA+lCe8RlZ8hcQ
+L8JKymQ3TDk/0a+t4y/ARC9bJ0ttOPY4K7WD21ddd0/xlz/AvA2g/f1Amlf0DC3T
+87DC7gaHEZw/ou5vFwZ3rHx5oWPiTRDFqwU8D1q3F9kbYMsc+2a9L9OFsZcr9Z3p
+7E3PidcxsIYG8dwe2knsZ9bQcxiRUaosXOP+BObh8w+/RKB9uwJR3YYlu8lxP68=
+</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://ladok3.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml b/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
index 03f4a29b..eb7a6980 100644
--- a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
@@ -26,8 +26,8 @@
   </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="http://luvittest1.education.lu.se/Shibboleth.sso/Login-lu"/>
-      <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="http://luvittest1.education.lu.se/Shibboleth.sso/Login-swamid" 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://luvittest1.education.lu.se/Shibboleth.sso/Login-lu"/>
+      <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://luvittest1.education.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Lund University LUVIT Test1</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Lund University LUVIT Test1</mdui:DisplayName>
@@ -69,19 +69,20 @@ V++yEkt5n8e8BoA3PHj5/MSgzEqPnlNRMhTX5QYW4TYy23uQaXVwybYPSw==
       <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="http://luvittest1.education.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://luvittest1.education.lu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://luvittest1.education.lu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://luvittest1.education.lu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://luvittest1.education.lu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://luvittest1.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://luvittest1.education.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://luvittest1.education.lu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://luvittest1.education.lu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvittest1.education.lu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvittest1.education.lu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml b/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml
index 8e483139..f6c55379 100644
--- a/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml
@@ -26,8 +26,8 @@
   </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="http://luvittest2.education.lu.se/Shibboleth.sso/Login-lu"/>
-      <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="http://luvittest2.education.lu.se/Shibboleth.sso/Login-swamid" 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://luvittest2.education.lu.se/Shibboleth.sso/Login-lu"/>
+      <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://luvittest2.education.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Lund University LUVIT Test2</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Lund University LUVIT Test2</mdui:DisplayName>
@@ -69,19 +69,20 @@ V++yEkt5n8e8BoA3PHj5/MSgzEqPnlNRMhTX5QYW4TYy23uQaXVwybYPSw==
       <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="http://luvittest2.education.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://luvittest2.education.lu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://luvittest2.education.lu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://luvittest2.education.lu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://luvittest2.education.lu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://luvittest2.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://luvittest2.education.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://luvittest2.education.lu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://luvittest2.education.lu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvittest2.education.lu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvittest2.education.lu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvittest2.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
new file mode 100644
index 00000000..d64ef9d5
--- /dev/null
+++ b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
+  <md:Extensions>
+    <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://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Member portal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Medlemsportalen för Linnéstudenterna</mdui:Description>
+        <mdui:Description xml:lang="en">Member Portal for Linnéstudenterna</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAN2u8Hhf8Mr2MA0GCSqGSIb3DQEBBQUAMIGeMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEKMAgGA1UECwwBLTElMCMGA1UEAwwcbWVkbGVtLnN0dWRlbnRrYXJlbmlib3Jhcy5zZTEgMB4GCSqGSIb3DQEJARYRam9oYW5AbW9udGFuaWEuc2UwHhcNMTMwNjE0MTMyODQyWhcNMjMwNjE0MTMyODQyWjCBnjELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxCjAIBgNVBAsMAS0xJTAjBgNVBAMMHG1lZGxlbS5zdHVkZW50a2FyZW5pYm9yYXMuc2UxIDAeBgkqhkiG9w0BCQEWEWpvaGFuQG1vbnRhbmlhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzD70ltiDLf7KOMs+B1HPuMmC4MgEBPdLBxa2GLaYPnRmSm0NM5FIl6o72N+2PXnPqR1sVp4pWr6xk1nKhh73S3WUCIAiSHsGL6Xea7DEgtJ0sIw5QSqZ4rgA+2xBS7hb7A1WjAfFH0fxw3bgpg9gVpEzbgZNJYkbgwkD5JrFKfQv1GPMz4Lf8gph+t4ky+oFWjnyTjIqpTM71OPzSpvOkG8sOatUwCqnbGFJti0e+IDDTCkLZJAybLrxa99FYRLNfEkIbK3KiSxSOIMMJ49iXisAoIOSFqVeGcf+I6caVnVQTfKzxpHUFauYAtYhypvYQzUeVYZF1KVkth75lrzIwwIDAQABo1AwTjAdBgNVHQ4EFgQUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwHwYDVR0jBBgwFoAUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAycydQTVP61CvGXzkbP4hEuDGVAlfTY4l3jp970aWAMQOQTVAevJnSDXDq++7weohqmC21lJjNlv0TvdrgqQGpF+pKdR0DRnYyLg87/idUhOvU+h5bJy6O/rz94VK1/G7lc/TSZ2B8KIcQRB7fcyquwKR9v5pulYijxM21Qj/QBu0sxUqMJ2px4vh2ct86p6z54qQiN0xbVPGbjDYT7ITjE5pCUu/BdQfN0/1CwimhUxcf+R/4l8ZJVIE9G+QRdV1mhYglX3MlYfFsf6hovTe4ZWWV07023D1iC+JxctCb2jDJQoxPDAo1jxSFVydyHor9SeMdkw7gx7mqQWNDBqj9w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAN2u8Hhf8Mr2MA0GCSqGSIb3DQEBBQUAMIGeMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEKMAgGA1UECwwBLTElMCMGA1UEAwwcbWVkbGVtLnN0dWRlbnRrYXJlbmlib3Jhcy5zZTEgMB4GCSqGSIb3DQEJARYRam9oYW5AbW9udGFuaWEuc2UwHhcNMTMwNjE0MTMyODQyWhcNMjMwNjE0MTMyODQyWjCBnjELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxCjAIBgNVBAsMAS0xJTAjBgNVBAMMHG1lZGxlbS5zdHVkZW50a2FyZW5pYm9yYXMuc2UxIDAeBgkqhkiG9w0BCQEWEWpvaGFuQG1vbnRhbmlhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzD70ltiDLf7KOMs+B1HPuMmC4MgEBPdLBxa2GLaYPnRmSm0NM5FIl6o72N+2PXnPqR1sVp4pWr6xk1nKhh73S3WUCIAiSHsGL6Xea7DEgtJ0sIw5QSqZ4rgA+2xBS7hb7A1WjAfFH0fxw3bgpg9gVpEzbgZNJYkbgwkD5JrFKfQv1GPMz4Lf8gph+t4ky+oFWjnyTjIqpTM71OPzSpvOkG8sOatUwCqnbGFJti0e+IDDTCkLZJAybLrxa99FYRLNfEkIbK3KiSxSOIMMJ49iXisAoIOSFqVeGcf+I6caVnVQTfKzxpHUFauYAtYhypvYQzUeVYZF1KVkth75lrzIwwIDAQABo1AwTjAdBgNVHQ4EFgQUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwHwYDVR0jBBgwFoAUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAycydQTVP61CvGXzkbP4hEuDGVAlfTY4l3jp970aWAMQOQTVAevJnSDXDq++7weohqmC21lJjNlv0TvdrgqQGpF+pKdR0DRnYyLg87/idUhOvU+h5bJy6O/rz94VK1/G7lc/TSZ2B8KIcQRB7fcyquwKR9v5pulYijxM21Qj/QBu0sxUqMJ2px4vh2ct86p6z54qQiN0xbVPGbjDYT7ITjE5pCUu/BdQfN0/1CwimhUxcf+R/4l8ZJVIE9G+QRdV1mhYglX3MlYfFsf6hovTe4ZWWV07023D1iC+JxctCb2jDJQoxPDAo1jxSFVydyHor9SeMdkw7gx7mqQWNDBqj9w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Sölve</md:SurName>
+    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 813f3965..abdcb4ca 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -1,18 +1,21 @@
 <?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://shibbo.ltu.se/idp/shibboleth">
   <Extensions>
-    <attr:EntityAttributes xmlns:attr="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">
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute 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>
+      <saml:Attribute xmlns="" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
     </attr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor 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">ltu.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet gammal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lulea University of Technology old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
@@ -97,8 +100,8 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet gammal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lulea University of Technology old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index 2a586734..5e1d358c 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -21,6 +21,7 @@
       <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://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index 6daa0398..13ef698f 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -5,6 +5,7 @@
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -15,7 +16,7 @@
         <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
         <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/#/privacy</mdui:PrivacyStatementURL>
         <mdui:Logo height="100" width="100">https://www.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index b958f493..8ced9c12 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -11,7 +11,6 @@
   <xi:include href="swamid-2.0/idp.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>  
-  <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hkr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
@@ -50,4 +49,5 @@
   <xi:include href="swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hj.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.sunet.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.ltu.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 09ca6ef1..c42d8f22 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -26,4 +26,5 @@
   <xi:include href="swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml"/>
   <xi:include href="swamid-2.0/scalear-staging2.herokuapp.com.xml"/>
   <xi:include href="swamid-2.0/test.scalable-learning.com.xml"/>
+  <xi:include href="swamid-2.0/www.scalable-learning.com.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index cc66403e..5aef0206 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,4 +16,7 @@
   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp3.sics.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b91d3d2e..eca5cee2 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -627,4 +627,7 @@
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edumeta.sae.kau.se.xml"/>
   <xi:include href="swamid-2.0/play.ki.se.xml"/>
+  <xi:include href="swamid-2.0/emrex-test.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+  <xi:include href="swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 9c243011..499400fb 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -44,7 +44,6 @@
   <xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.uhr.se-idp-shibboleth.xml"/>