aggregate update & adfs-proxy-test

author: Leif Johansson <leifj@sunet.se> 2016-02-15 13:22:41 +0100
committer: Leif Johansson <leifj@sunet.se> 2016-02-15 13:22:41 +0100
commit: 8a4b229d0ca09bceca6dcf65b64a72d0c0aab744 (patch)
tree: 500af9eb4c22e0eed674f178c19ace544ff8e36d /swamid-2.0
parent: cb1cfc791660d27a369c7c21435792231c0b9a53 (diff)
37 files changed, 2485 insertions, 0 deletions
diff --git a/swamid-2.0/acc-nais.i.uhr.se-shibboleth.xml b/swamid-2.0/acc-nais.i.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..3285d942
--- /dev/null
+++ b/swamid-2.0/acc-nais.i.uhr.se-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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://acc-nais.i.uhr.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: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://acc-nais.i.uhr.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://acc-nais.i.uhr.se/Shibboleth.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://acc-nais.i.uhr.se/Shibboleth.sso/Login" index="2"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/Login" index="3"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://acc-nais.i.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="4"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Acc-NaisSP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Acc-NaisSP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NAIS står för Nationellt Administrations- och Informationssystem för samordnare av särskilt pedagogiskt stöd</mdui:Description>
+        <mdui:Description xml:lang="en">NAIS stands for National Administration- and Information system for coordination of pedagogical aid</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhrval-test.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhrval-test.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKrvj/quXo0oMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHVocnZhbC10ZXN0LmkudWhyLnNlMB4XDTE0MTIwODA5MTExMVoXDTI0MTIw
+NTA5MTExMVowHzEdMBsGA1UEAxMUdWhydmFsLXRlc3QuaS51aHIuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtIWX5i6gPePK7nbap8snxwcLqlCID
+LWZkxbQGCVIgixRk1w87yUD882SSZjUATS8JV+8TeHNIsRSkBeXB1MQQopeDtm5C
+LDhh/RxHL3IRBlhesOE5zWcc4xeBzRIBKb1OC773XbSLx1lQhZmH+fiQvEk5FfWG
+ri683HBCQq3gpc3hX2lY7C7oAxL7KST+37zLIBy7c83fzWr3eQ1myKZFfHBsmMOt
+pNjBNMG8V924gaHWKAuqDa6lds53PszYZh27bN7dWXRrN0vXEZu6zfEioJVvg5RL
+c0lUqg/yu8Dk9JYYm9rQDj007livs9QllR54wsIxosVQWhAz36ZFafaNAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHVocnZhbC10ZXN0LmkudWhyLnNlMB0GA1UdDgQWBBSG
+EGTlhQfKssjt+WgDPIKFHzzZEDANBgkqhkiG9w0BAQUFAAOCAQEAOHImN37aqOBU
+wicsP5vJ7X8yX6he/dAnRKhZbjWSlpFSZGwZrV/B6YeROAyRbzQH1fQRTup+angF
+B5m+vmxG0XjhUm8gXpMNqjgxaay72m2rPTVAkbqkMNTKNf44bRK5OGqPlJ0lwrnC
+Wh1+2EdKahr4lzJaqiW2rXvX3moTYqrJlssglT+IRTzoNbL6eQLdqCVvZxXDjyUb
+D79D+ECq8yjkS4/8EQlvHdHozRMMplJTo+pXoZwV9KZgMMsxdT63VuJ/0HRCxCMC
+zcmOSN36LTlSIYY4q9pC8MCzt5YqZdnKJUIyjFy+Mmjeyw4t+ouUjjI6+AifCten
+BwquFopAQg==
+</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://acc-nais.i.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc-nais.i.uhr.se/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml b/swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml
new file mode 100644
index 00000000..5aa1d327
--- /dev/null
+++ b/swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml
@@ -0,0 +1,23 @@
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://adfs-proxy-test.swamid.se:10000/Saml2IDP/proxy.xml"><ns0:Extensions><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160" /><ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" /><ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160" /><ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" /></ns0:Extensions><ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:KeyDescriptor use="signing"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIIEBjCCAu6gAwIBAgIJANwxpCjfD5fLMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTAeFw0xNTEy
+MTAxNDMzNTlaFw0yNTEyMDcxNDMzNTlaMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQI
+EwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
+GDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOCyQM982ZWJRI6SJ5nPCX2TZATHJfpsWHzXRQpt/vrtmYkvaWKL
+BqSzNhJkiPRrZl4xtJQXtDfUH8ZOnQU0T4IivOuvlP4pytlTYzE1WjSPZY6UJCw5
+MfGnZ+l5vdYv4XiR2dS+L3IYfQeX+pAh61LHXayxMdfNdXRfV+/pnp93qhW5ZjMn
+K076hicbfg4XCXk3Lw7PoJPNWWgcKCwddHMHFSpIhBgp5LtNiooT5hfHypbTSHaQ
+apVlScuzXlMAkeH9srhEO0BDT1Rq0dScMuttF1eY/h+T1N9Vha1dVu1WgynfboaC
+8BUBLM0KoxcguRuGD2/ruFaOCWCMXAv54DcCAwEAAaOBxDCBwTAdBgNVHQ4EFgQU
+as56pDo5FS+9I7xnVXOVp5De8H0wgZEGA1UdIwSBiTCBhoAUas56pDo5FS+9I7xn
+VXOVp5De8H2hY6RhMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
+MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xv
+a2kuaXRzLnVtdS5zZYIJANwxpCjfD5fLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAAERtzf3jrf0VnwbGr0iOoJUFcuanAObMG6PM20Y/PBdPi0XBnlH
+ReXHkGnMiY44cdyQByJH/HRTIGPmNEwUPtzvsLcwpxWz6sAogQlXhgI6ZHVaTt3T
+XBJGBi+cuG4ggRZSvcmJLwJ1EpwWXNVekiIEQbW+mlwARLbM5N7btQRA3DWofbIx
+JLn4HckD/n5dq5ueniyDqDgc2o1V2/G/zpEg90lIN7gsSOOqsbttMZFvGq3m+t3E
+KxjpGx+7PhkGMf9zCVrXXztaqDyZjeNa/rpADj+kU6KudZ9eESvdppCBR0EiROm0
+8xZOMdYU6Sc6SJVa/W48bqJsv95pCZM6joU=
+</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/post" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/redirect" /></ns0:IDPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">Rebecka Identities Org.</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">Rebecka Identities</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">http://www.example.com</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>Technical</ns0:GivenName><ns0:EmailAddress>technical@example.com</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>support@example.com</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>
diff --git a/swamid-2.0/alpha.kib.ki.se-shibboleth.xml b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
new file mode 100644
index 00000000..778d36bb
--- /dev/null
+++ b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://alpha.kib.ki.se/shibboleth">
+  <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" 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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>alpha.kib.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=ubitdos@kib.ki.se,CN=alpha.kib.ki.se,OU=KIB,O=Karolinska Institutet,L=Solna,ST=Stockholm,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEwTCCA6mgAwIBAgIJANfhtA1MBOtvMA0GCSqGSIb3DQEBBQUAMIGbMQswCQYD
+VQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMQ4wDAYDVQQHEwVTb2xuYTEeMBwG
+A1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MQwwCgYDVQQLEwNLSUIxGDAWBgNV
+BAMTD2FscGhhLmtpYi5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0BraWIu
+a2kuc2UwHhcNMTIwNTAzMTExNTI4WhcNMjIwNTAxMTExNTI4WjCBmzELMAkGA1UE
+BhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTEOMAwGA1UEBxMFU29sbmExHjAcBgNV
+BAoTFUthcm9saW5za2EgSW5zdGl0dXRldDEMMAoGA1UECxMDS0lCMRgwFgYDVQQD
+Ew9hbHBoYS5raWIua2kuc2UxIDAeBgkqhkiG9w0BCQEWEXViaXRkb3NAa2liLmtp
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1LxQJjRfOa4TYyaB
+2DpENVfwEglvfISRync9HKIN9XBYhupdNdGWdG5xGipgmicio8DrVV9sKfPwe4DV
+NBqzlr1C9/NVtauvvMotCMyNGYHF/vZ4H6cnRTZyzxxBZv/V1xYB5I7vB7IUABf8
+ZxJb4NIA5OUaxg/8v2x3S8cVGzgX1hZOlwhY+Hbiz0136DFe1YwH5APJwlhkeYh6
+XwllnzooqL4XxqYz9grBIdNtRc4UfrOvaX7WSXpTeouzSnWkf3pqjJHZENBEd/W1
+8xu8CKCItdQZH/OVuiTVe5ccS1S7sS4kXdbPfpHdPocgwbDP1Deh8tqo5sQ0qoMn
+CH+pzQIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFJyQ1BAIGQqsZds+rXVYA7cF+BoA
+MIHQBgNVHSMEgcgwgcWAFJyQ1BAIGQqsZds+rXVYA7cF+BoAoYGhpIGeMIGbMQsw
+CQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMQ4wDAYDVQQHEwVTb2xuYTEe
+MBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MQwwCgYDVQQLEwNLSUIxGDAW
+BgNVBAMTD2FscGhhLmtpYi5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0Br
+aWIua2kuc2WCCQDX4bQNTATrbzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4IBAQBxfOPouQExqGKDS1+wbml8tmoOHinZo/yHczbyjYQaOvxUlq2fk056UxxB
+2asNaohnKJQHISPmiFDYpqkC7n8Ssi8mWTLFUab/3jduuKCeUKPrfjPVRVPYKnsa
+wPimBhGmFcVuGoeudeT4PPASP7QI6lpO19Pef+mC7NBdFLv00yJ/HnR2mBbLe/BM
+uBzttF3cPnOAOb4sXPHwDSC4Cj3Gsphcs5Yw3E+sz3/fuWEh+wt+s8vXD5CP3ab4
+ZCZOEsUu5whOLrDTWBwIG/fvbk7J1lXj2aVV+zdk97DHax0+uMDGE3mFaIzz2dg5
+uX4aWLHHp/MpbOpwCAVWQDlPdXYS
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>alpha.kib.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=ubitdos@kib.ki.se,CN=alpha.kib.ki.se,OU=KIB,O=Karolinska Institutet,L=Solna,ST=Stockholm,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEwTCCA6mgAwIBAgIJANfhtA1MBOtvMA0GCSqGSIb3DQEBBQUAMIGbMQswCQYD
+VQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMQ4wDAYDVQQHEwVTb2xuYTEeMBwG
+A1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MQwwCgYDVQQLEwNLSUIxGDAWBgNV
+BAMTD2FscGhhLmtpYi5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0BraWIu
+a2kuc2UwHhcNMTIwNTAzMTExNTI4WhcNMjIwNTAxMTExNTI4WjCBmzELMAkGA1UE
+BhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTEOMAwGA1UEBxMFU29sbmExHjAcBgNV
+BAoTFUthcm9saW5za2EgSW5zdGl0dXRldDEMMAoGA1UECxMDS0lCMRgwFgYDVQQD
+Ew9hbHBoYS5raWIua2kuc2UxIDAeBgkqhkiG9w0BCQEWEXViaXRkb3NAa2liLmtp
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1LxQJjRfOa4TYyaB
+2DpENVfwEglvfISRync9HKIN9XBYhupdNdGWdG5xGipgmicio8DrVV9sKfPwe4DV
+NBqzlr1C9/NVtauvvMotCMyNGYHF/vZ4H6cnRTZyzxxBZv/V1xYB5I7vB7IUABf8
+ZxJb4NIA5OUaxg/8v2x3S8cVGzgX1hZOlwhY+Hbiz0136DFe1YwH5APJwlhkeYh6
+XwllnzooqL4XxqYz9grBIdNtRc4UfrOvaX7WSXpTeouzSnWkf3pqjJHZENBEd/W1
+8xu8CKCItdQZH/OVuiTVe5ccS1S7sS4kXdbPfpHdPocgwbDP1Deh8tqo5sQ0qoMn
+CH+pzQIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFJyQ1BAIGQqsZds+rXVYA7cF+BoA
+MIHQBgNVHSMEgcgwgcWAFJyQ1BAIGQqsZds+rXVYA7cF+BoAoYGhpIGeMIGbMQsw
+CQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMQ4wDAYDVQQHEwVTb2xuYTEe
+MBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MQwwCgYDVQQLEwNLSUIxGDAW
+BgNVBAMTD2FscGhhLmtpYi5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0Br
+aWIua2kuc2WCCQDX4bQNTATrbzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4IBAQBxfOPouQExqGKDS1+wbml8tmoOHinZo/yHczbyjYQaOvxUlq2fk056UxxB
+2asNaohnKJQHISPmiFDYpqkC7n8Ssi8mWTLFUab/3jduuKCeUKPrfjPVRVPYKnsa
+wPimBhGmFcVuGoeudeT4PPASP7QI6lpO19Pef+mC7NBdFLv00yJ/HnR2mBbLe/BM
+uBzttF3cPnOAOb4sXPHwDSC4Cj3Gsphcs5Yw3E+sz3/fuWEh+wt+s8vXD5CP3ab4
+ZCZOEsUu5whOLrDTWBwIG/fvbk7J1lXj2aVV+zdk97DHax0+uMDGE3mFaIzz2dg5
+uX4aWLHHp/MpbOpwCAVWQDlPdXYS
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://alpha.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alpha.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alpha.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alpha.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://alpha.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alpha.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alpha.kib.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alpha.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alpha.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/amiga.kib.ki.se-shibboleth.xml b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
new file mode 100644
index 00000000..e78b7388
--- /dev/null
+++ b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://amiga.kib.ki.se/shibboleth">
+  <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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://amiga.kib.ki.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>cbs-vamiga2.cb.ad</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=cbs-vamiga2.cb.ad</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAI/jlsIaImbuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWNicy12YW1pZ2EyLmNiLmFkMB4XDTEyMDEyNTE1MDcyMFoXDTIyMDEyMjE1
+MDcyMFowHDEaMBgGA1UEAxMRY2JzLXZhbWlnYTIuY2IuYWQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQD8hH4aZW5mwrL2q4HmRewIhpwyv6Y/cp1m2jvp
+J72Q1Hm1hA7lvz36BbDvpLj6nY03t4KtPIRqMfsdM7olfW9aqLuFlrGCwW5jucSt
+2q1hIMyD6k+fAookYXzEnOcR2s4UqViWqDWulTnIhSTZmgS+CoMqEfoGzPC3m5X5
+SzTbismoWnnzRujfdUj0nLrCEU7gluZH1ag737ISR1qolNpyvS/hazMmGxFKEePW
+WGnUp4/enpdqIlYNqDX0FBr+/RXrLM7GloIj3s9J83oMWXLTUiCTwPyW0Yh0UySd
+cxfVHOKUe4g6n2MbC8sotatKD7Vg8hPZwlMF1mDLYZxKST/jAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWNicy12YW1pZ2EyLmNiLmFkMB0GA1UdDgQWBBQyr0RxfgrJY6Ej
+PBJk8DqV6LoXdjANBgkqhkiG9w0BAQUFAAOCAQEAYnfKqiA3WIA9m/gcbsnFHs+Y
+wc1Qpud5avz9PIj9i6bbz/qEtKNUzg4bw3Mp8y0taNyJ+jpR/QCMGoSF+PcyjbS8
+eNcQWwcoSrukwSGNRtU9JUrVekOqi8pq8I2lLJXRMyDHrQ8hQcIydZRQS/Zsxy9E
+YP5oUY2cwkBfl2v6ipoF5FYQRwcfVYTTQD5zZSS74OQWpQU6qXus34JTf/DVNzeT
+gL6webRP5OqizXYZlJZKKOVemeUHBcc/PGI1bq1na8jeAZ9jw+p7zHJWZTZPl9iL
+PHvIC/GJm2biV6LD6eLIriuNXZ5mcocCsCScdEpNLUp2+0+V+tE3Vj1c1jKmfA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amiga.kib.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml b/swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
new file mode 100644
index 00000000..e802d491
--- /dev/null
+++ b/swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://callback-prod.inloggning.se/simplesaml/saml2/idp/meta_7baf0ac137159c2b28aebc5956e46bff">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEszCCBBygAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwIBcNMTMwMjI3MTkwOTUxWhgPMjA1NTAzMjQxOTA5NTFaMIHxMQswCQYDVQQGEwJTRTEQMA4GA1UECBMHVXBwbGFuZDEQMA4GA1UEBxMHVXBwc2FsYTElMCMGA1UEChMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTFJMEcGA1UECxRASGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbV9IYW5kZWxzaMO2Z3Nrb2xhbiBpIFN0b2NraG9sbV9TdmVJRDElMCMGA1UEAxMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp9bWZrlq/UMCHXlF36AXf8/C3emyOU86q4r3ouW+mOqrOzpnRF6W/7nMPdFWKYOFzC2gjGCGKG24rFAkNyW4qLUAF/R4lGHFOnZpcWeE8aCTwne8l3NdkZ3mKCj3/h4969+MgR2malTEk/bWR8fCtPfZtjgDOmRA9A2aaPJbvBUCAwEAAaOCAVUwggFRMB0GA1UdDgQWBBSa/TT11CoSMwD75RbSe2BeGnZ+jzCCASAGA1UdIwSCARcwggETgBSa/TT11CoSMwD75RbSe2BeGnZ+j6GB96SB9DCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQCCWkab83PQphIqKhxIF7WubZvC2Nz+t69VP1LIGP5X8mIEqLHchPFJlPmWdWu+nEBsp9iEkP2QNBZi1R8LVmqlc+DavtpedHs58Oihe9FuWb9hrjFHglvJm4VIAuJ72zo1oS5HCYNNxS7ohXSkY3OdEhEyssypW3LnjnoTesn2FQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEszCCBBygAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwIBcNMTMwMjI3MTkwOTUxWhgPMjA1NTAzMjQxOTA5NTFaMIHxMQswCQYDVQQGEwJTRTEQMA4GA1UECBMHVXBwbGFuZDEQMA4GA1UEBxMHVXBwc2FsYTElMCMGA1UEChMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTFJMEcGA1UECxRASGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbV9IYW5kZWxzaMO2Z3Nrb2xhbiBpIFN0b2NraG9sbV9TdmVJRDElMCMGA1UEAxMcSGFuZGVsc2hvZ3Nrb2xhbiBpIFN0b2NraG9sbTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp9bWZrlq/UMCHXlF36AXf8/C3emyOU86q4r3ouW+mOqrOzpnRF6W/7nMPdFWKYOFzC2gjGCGKG24rFAkNyW4qLUAF/R4lGHFOnZpcWeE8aCTwne8l3NdkZ3mKCj3/h4969+MgR2malTEk/bWR8fCtPfZtjgDOmRA9A2aaPJbvBUCAwEAAaOCAVUwggFRMB0GA1UdDgQWBBSa/TT11CoSMwD75RbSe2BeGnZ+jzCCASAGA1UdIwSCARcwggETgBSa/TT11CoSMwD75RbSe2BeGnZ+j6GB96SB9DCB8TELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xSTBHBgNVBAsUQEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG1fSGFuZGVsc2jDtmdza29sYW4gaSBTdG9ja2hvbG1fU3ZlSUQxJTAjBgNVBAMTHEhhbmRlbHNob2dza29sYW4gaSBTdG9ja2hvbG0xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQCCWkab83PQphIqKhxIF7WubZvC2Nz+t69VP1LIGP5X8mIEqLHchPFJlPmWdWu+nEBsp9iEkP2QNBZi1R8LVmqlc+DavtpedHs58Oihe9FuWb9hrjFHglvJm4VIAuJ72zo1oS5HCYNNxS7ohXSkY3OdEhEyssypW3LnjnoTesn2FQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://callback-prod.inloggning.se/simplesaml/saml2/idp/sls_7baf0ac137159c2b28aebc5956e46bff"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://callback-prod.inloggning.se/simplesaml/saml2/idp/sls_7baf0ac137159c2b28aebc5956e46bff"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://callback-prod.inloggning.se/simplesaml/saml2/idp/ssos_7baf0ac137159c2b28aebc5956e46bff"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://callback-prod.inloggning.se/simplesaml/saml2/idp/ssos_7baf0ac137159c2b28aebc5956e46bff"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/?page=idps#hhs</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml b/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..63bc6c1b
--- /dev/null
+++ b/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://captivelan.it.su.se/Shibboleth.sso">
+  <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://captivelan.it.su.se/Shibboleth.sso/WAYF"/>
+      <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://captivelan.it.su.se/Shibboleth.sso/WAYF" 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://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan"/>
+      <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://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/SWAMID"/>
+      <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://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan-test" index="3"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>captivelan-prod-carp1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=captivelan-prod-carp1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAOj7uHDYhhhAMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHmNhcHRpdmVsYW4tcHJvZC1jYXJwMS5pdC5zdS5zZTAeFw0xMjA4MTYwNjQ3
+MDlaFw0yMjA4MTQwNjQ3MDlaMCkxJzAlBgNVBAMTHmNhcHRpdmVsYW4tcHJvZC1j
+YXJwMS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMzx
+w+bemmxOUna+e8r3EYf8K/lhbRqnIpvHBtCvQ8Hs9NPbeBdQU146UwEGGSm9eBsR
+OEekCXgjudorIvjt8O/wxmjCNmHzj/2qP+Adbj/0t7tY+Fq+SXZAvQHGnxX9yDbr
+opA8ge9pDhglakg/2L9qAS2ud0YH4tv43qL/60CVDBOrMmRNDWqqxYwB3scCiz9+
+R+dlbACube/4NWPma5oaezMwEQy0snBD8IgeEdvpp/l62RcrcI+7SWUNs6isgG0o
+9+TyRYBpmpcbG6Y+xhjWfYRN10XGXngNJ5VLcWnuJ35ryhQgKlviU4PJl7421Glw
+w3Uwk7f9w4Zy3UZ2lKUCAwEAAaNMMEowKQYDVR0RBCIwIIIeY2FwdGl2ZWxhbi1w
+cm9kLWNhcnAxLml0LnN1LnNlMB0GA1UdDgQWBBRj066uDCEkGZj71jtrxJ0RJvEt
+IDANBgkqhkiG9w0BAQUFAAOCAQEAcx8+oqL6kN2Fbl29VdMFOy2as/5porQVoHC8
+rkwQT86kuunaY5QaMSeo+NJ7RbwN8PGLP0syrrdhb9WdWOClD00ZEf0AqiPHJeQQ
+PLCoyyOQYarfWC2dSEZ8gbvJpU2nu3GZ1g5tf5rN6UWtzeTxtIRav6OiTuoojM0C
+qsBAyUcnBfNjtpa3swU7Vfd4MAOqyPqZHm/512/RSW+hYpOjMNcp1RkOy7ne1GK/
+mcsQPmRHkRImnweyygzpYMQ+1uLdEdi0wbmVQpMcSlrQ4Dt558PfmXAIrvXwd3of
+ROU2a0niXfGVaIomY/J7Xkazao4dQmFvwHY77hTp6Qhf3PlYOw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/cbs-vylvatest.kib.ki.se-shibboleth.xml b/swamid-2.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
new file mode 100644
index 00000000..b5f76502
--- /dev/null
+++ b/swamid-2.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cbs-vylvatest.kib.ki.se/shibboleth">
+  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB7TCCAVagAwIBAgIJAMV5iXtJKd2UMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2Nicy12eWx2YXRlc3Qua2liLmtpLnNlMB4XDTA4MDcyMzEzMDM0OFoXDTA5MDcyMzEzMDM0OFowIjEgMB4GA1UEAxMXY2JzLXZ5bHZhdGVzdC5raWIua2kuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPAnswr/MkrQXkXZJbv3ArV/q0kowtVLnQIM6nuJjyw/96cQ7UuYFOFpIEhT+fQdthkKdSAAa74U10+r6wUqj7HgGWrKDn6HfGaYUx5vuLt7kHIuLSTdnU5xbH+9D2S1BwdK8qEjCtT5kxPk4/2mXpTVEdQRXdaxLanrIk4Sex/bAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAvRiCRo0g0bZ8TNZWO5iCmdrMCtDTM4I9JYf0zR0hYbf61U2r1h2iE3IfC4JvNmclEDbhL/aJQrqgglG8mSyBVYN9mu3L3y+O0ZvCLGC5EOHTLVZjihfL1VDwt054lB18AkxOh2H+dkcq6B7cI0XdFesHi4iW9HGr23C22xfLIpQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cbs-vylvatest.kib.ki.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">KI</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Karolinska Institutet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ki.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>KI bibliotek</Company>
+    <GivenName>Ylva</GivenName>
+    <SurName>Gavel</SurName>
+    <EmailAddress>ylva.gavel@ki.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..a8a6a939
--- /dev/null
+++ b/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd-test.it.su.se/Shibboleth.sso">
+  <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:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Testimplementation av Crowd vid Stockholms universitet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Denna tjänst ger användare tillgång till test implantationen av Crowd vid Stockholms universitet.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Test implementation of Crowd at Stockholm University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">This service allows users to access the test implantation of Crowd at Stockholm University.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mino-lab02</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=mino-lab02</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJAMatSzUiGYC+MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCm1pbm8tbGFiMDIwHhcNMTMwNDE5MDY0MzI5WhcNMjMwNDE3MDY0MzI5WjAV
+MRMwEQYDVQQDEwptaW5vLWxhYjAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp+49hJCsA/5loQJX/jLCVDxHAu9yxE3Z0qoJCjLP7dw+/gPTk9l0TRIk
+QtUNEiZfDT56mi8VyW4UXuGN8/fFSSRG4gUGGqyvJxloykBjb2INT5VR4Lq4UMfm
+nEi5rPmvdU3r2p7LMWERg5t+Q7h9pmlje7hcxcg+5RkMN8ajOYEST71BIV1qw8I6
+f0yEPDDTqKDBcZbtuSDmUqT7Pn/s0alnRGW14TYliqS/jcFjr5TASxoewTj+wOR2
+2WJDlH+jl2REnLh7D24FtY8qLwFlBytv47yQ2DHbSe/upHU/T31T/t8a/XoKwUXV
+1HCcFmNn3RswrIPHVNyjku2eJhDpsQIDAQABozgwNjAVBgNVHREEDjAMggptaW5v
+LWxhYjAyMB0GA1UdDgQWBBROPqY7m/x1ubOhNpSaEFG+X6uC/TANBgkqhkiG9w0B
+AQUFAAOCAQEABLSrJnnIvhyy41FHzdK3YKjWL7FmQ0265fshjDimly4F3BD8bcW1
+UIWeHkYmoMBqe+6VQORjI8DU6IuTm39+j47ccX9wd4a8Xoghu66yAdE2LAeo5W+7
+GhqJuug/eIRbYxlRjyC/1TKQdX2HakEoo5MGZM4HKA53bU3hGUok7WJgxnNMx460
+am2vwvGH7tTbqM3brwt4FfnWG881v//OZD50A62vWwSNg6qpDAaT52+qdrZ8TSRV
+VeDKoZXj5MlQdx5DCOpkboieItTO5OUCLb/3VFWtPLi6aF2/Wfbl0aYfE5FjV0Bj
+KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mino-lab02</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=mino-lab02</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJAMatSzUiGYC+MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCm1pbm8tbGFiMDIwHhcNMTMwNDE5MDY0MzI5WhcNMjMwNDE3MDY0MzI5WjAV
+MRMwEQYDVQQDEwptaW5vLWxhYjAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp+49hJCsA/5loQJX/jLCVDxHAu9yxE3Z0qoJCjLP7dw+/gPTk9l0TRIk
+QtUNEiZfDT56mi8VyW4UXuGN8/fFSSRG4gUGGqyvJxloykBjb2INT5VR4Lq4UMfm
+nEi5rPmvdU3r2p7LMWERg5t+Q7h9pmlje7hcxcg+5RkMN8ajOYEST71BIV1qw8I6
+f0yEPDDTqKDBcZbtuSDmUqT7Pn/s0alnRGW14TYliqS/jcFjr5TASxoewTj+wOR2
+2WJDlH+jl2REnLh7D24FtY8qLwFlBytv47yQ2DHbSe/upHU/T31T/t8a/XoKwUXV
+1HCcFmNn3RswrIPHVNyjku2eJhDpsQIDAQABozgwNjAVBgNVHREEDjAMggptaW5v
+LWxhYjAyMB0GA1UdDgQWBBROPqY7m/x1ubOhNpSaEFG+X6uC/TANBgkqhkiG9w0B
+AQUFAAOCAQEABLSrJnnIvhyy41FHzdK3YKjWL7FmQ0265fshjDimly4F3BD8bcW1
+UIWeHkYmoMBqe+6VQORjI8DU6IuTm39+j47ccX9wd4a8Xoghu66yAdE2LAeo5W+7
+GhqJuug/eIRbYxlRjyC/1TKQdX2HakEoo5MGZM4HKA53bU3hGUok7WJgxnNMx460
+am2vwvGH7tTbqM3brwt4FfnWG881v//OZD50A62vWwSNg6qpDAaT52+qdrZ8TSRV
+VeDKoZXj5MlQdx5DCOpkboieItTO5OUCLb/3VFWtPLi6aF2/Wfbl0aYfE5FjV0Bj
+KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml b/swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml
new file mode 100644
index 00000000..7549a2bb
--- /dev/null
+++ b/swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml
@@ -0,0 +1,43 @@
+<?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://ecsidp.testa.antagning.se/ecs-idp">
+  <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">ecsidp.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIByDCCAXKgAwIBAgIJANhJ+qNF90hMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2UwHhcNMTIxMjEwMTIzMjE5WhcNMjIxMjA4MTIzMjE5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGEuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN8dn+bredQ2auZhy7AzqrYbDEGUNBgqZTCVredzhLDzf938Mf3CjL3Sm/TAv7knA2e9t0v7zujC1qQWz8tXkC0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUX4DQmxgmR0gLweAGWPI1dmsDF2owVAYDVR0jBE0wS4AUX4DQmxgmR0gLweAGWPI1dmsDF2qhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDYSfqjRfdITDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAbXNQpqiCBG++l2dOV1yJC1Eo9wF2aXjhqcARxLCh4DtQa26ahD28QJNONmNyeRwECEqNcK9xGjTiIvIX+DlL7g==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testa.antagning.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://ecsidp.testa.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testa.antagning.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIByDCCAXKgAwIBAgIJANhJ+qNF90hMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2UwHhcNMTIxMjEwMTIzMjE5WhcNMjIxMjA4MTIzMjE5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGEuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN8dn+bredQ2auZhy7AzqrYbDEGUNBgqZTCVredzhLDzf938Mf3CjL3Sm/TAv7knA2e9t0v7zujC1qQWz8tXkC0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUX4DQmxgmR0gLweAGWPI1dmsDF2owVAYDVR0jBE0wS4AUX4DQmxgmR0gLweAGWPI1dmsDF2qhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDYSfqjRfdITDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAbXNQpqiCBG++l2dOV1yJC1Eo9wF2aXjhqcARxLCh4DtQa26ahD28QJNONmNyeRwECEqNcK9xGjTiIvIX+DlL7g==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testa.antagning.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>
+</EntityDescriptor>
diff --git a/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml b/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
new file mode 100644
index 00000000..575568a8
--- /dev/null
+++ b/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
@@ -0,0 +1,76 @@
+<?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://ecsidp.testb.antagning.se/ecs-idp">
+  <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">ecsidp.testb.antagning.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">
+			Universitets- och högskolerådet
+		</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">
+			Swedish Council for Higher Education
+		</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">
+			Identity Provider för expertklient-användare av NyA-systemet(Test B).
+		</mdui:Description>
+        <mdui:Description xml:lang="en">
+			The Identity Provider for expert client users of the NyA-system(Test B).
+		</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIByDCCAXKgAwIBAgIJAMptPNMb9t58MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2UwHhcNMTMwNDA5MTIzOTE0WhcNMjMwNDA3MTIzOTE0WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGIuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0IHQx1Wp3X3XbG0lFDbSomZSzCTPlmSDs3/V6qHf/QKY2QdP4jYE8OfjkpmcEcJ74jTziAJCMcGdIMvPZgTU0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUv+uhe9BzI7V1JIfMFPagyYXBKZswVAYDVR0jBE0wS4AUv+uhe9BzI7V1JIfMFPagyYXBKZuhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQDKbTzTG/befDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAk4O6FFVkSvza7hfFmOAKm8H9UlWR4xN0dHspzPE0F0wRiyPGHOMezn1FSMPWTvJswRa5BioDh+EyUBYtiFoU4g==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testb.antagning.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://ecsidp.testb.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testb.antagning.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIByDCCAXKgAwIBAgIJAMptPNMb9t58MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2UwHhcNMTMwNDA5MTIzOTE0WhcNMjMwNDA3MTIzOTE0WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGIuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0IHQx1Wp3X3XbG0lFDbSomZSzCTPlmSDs3/V6qHf/QKY2QdP4jYE8OfjkpmcEcJ74jTziAJCMcGdIMvPZgTU0CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUv+uhe9BzI7V1JIfMFPagyYXBKZswVAYDVR0jBE0wS4AUv+uhe9BzI7V1JIfMFPagyYXBKZuhKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQDKbTzTG/befDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAk4O6FFVkSvza7hfFmOAKm8H9UlWR4xN0dHspzPE0F0wRiyPGHOMezn1FSMPWTvJswRa5BioDh+EyUBYtiFoU4g==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testb.antagning.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">
+		UHR
+	</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">
+		Swedish Council for Higher Education
+	</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">
+		http://www.uhr.se
+	</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>
+		Swedish Council for Higher Education
+	</Company>
+    <EmailAddress>
+		appldrift_saml@uhr.se
+	</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/gidp.geant.net-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/gidp.geant.net-sp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..72e6b642
--- /dev/null
+++ b/swamid-2.0/gidp.geant.net-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net/sp/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIRAOipFX0RJIRenc077AEf/TMwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDEyMjIwMDAwMDBaFw0xMzEyMjEyMzU5NTlaMIHwMRswGQYDVQQDExJ3d3cuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDIuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDEuZ2lkcC5nZWFudC5uZXQxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMUIwQAYDVQQKEzlEZWxpdmVyeSBvZiBBZHZhbmNlZCBOZXR3b3JrIFRlY2hub2xvZ3kgdG8gRXVyb3BlIExpbWl0ZWQxFzAVBgNVBAMTDmdpZHAuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshl/HoJhaoNUgaZ8HTIexsHKN2r7Lee0f+k04Jxnmo6o5OauxOpM0991B1xt+5FyXobgNjQSIcKKEvLwaTH7HYYI9bWvfHfVXaYzPOLySPKo+c3Tldbfq0NUXo18ZWuRadEaY+waChcnlkP7yq3ZPxva4aWUvA4iCqpjbZGpMYoJvWhrHua982mBOq29j2+1VwRpBFaverOb2f4jenhlnxstvF6KUSm6B6Y1XUfwJMjAEXxXdai7RodznXV8pCoJMGyn2GN7ClGCq6qHqtSerxdymGHNVpR7pXZ1tF/mI7JIsF+NFErmZJcW79pl7m5ZoZNR+SIDexdg1/IydduGwIDAQABo4IBnzCCAZswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFArEHsfdZvlpOxPguP9/En90/NMgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFcGA1UdEQRQME6CDmdpZHAuZ2VhbnQubmV0ghNpZHAxLmdpZHAuZ2VhbnQubmV0ghNpZHAyLmdpZHAuZ2VhbnQubmV0ghJ3d3cuZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAH56nltzImiMVOv5DJxcTo2cpGBWPO+OI7S1Ns76cS6PzWbkm/zjPPZI871Pfgw6n3Q3V3Kpc48hRyx3WPH/9nk+YnFEUjkjaRCzeWR6A2oYSb83iI2n/33+E2AmyZ1FX5E1nfxRtSBLYyHPdXYQ6A/TN4qtm/9QHrbcISPEQJwvJn4/BOQDrvsjZDJeq7Srrr2An//RpNdC9cA4wU+m0oJPbPHGl32ENO6JVK7gJPYw2WBDER1SMwAEThtUthQyZhp1z6jA/hoeHfM4QR2/mT458LpRXs1c5VGAeC+4pjfJ4skXAU17Nq+ut8+fJMjjQSXOpv10kS2jNq2XfPmN+K4=</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>MIIFUzCCBDugAwIBAgIRAOipFX0RJIRenc077AEf/TMwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDEyMjIwMDAwMDBaFw0xMzEyMjEyMzU5NTlaMIHwMRswGQYDVQQDExJ3d3cuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDIuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDEuZ2lkcC5nZWFudC5uZXQxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMUIwQAYDVQQKEzlEZWxpdmVyeSBvZiBBZHZhbmNlZCBOZXR3b3JrIFRlY2hub2xvZ3kgdG8gRXVyb3BlIExpbWl0ZWQxFzAVBgNVBAMTDmdpZHAuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshl/HoJhaoNUgaZ8HTIexsHKN2r7Lee0f+k04Jxnmo6o5OauxOpM0991B1xt+5FyXobgNjQSIcKKEvLwaTH7HYYI9bWvfHfVXaYzPOLySPKo+c3Tldbfq0NUXo18ZWuRadEaY+waChcnlkP7yq3ZPxva4aWUvA4iCqpjbZGpMYoJvWhrHua982mBOq29j2+1VwRpBFaverOb2f4jenhlnxstvF6KUSm6B6Y1XUfwJMjAEXxXdai7RodznXV8pCoJMGyn2GN7ClGCq6qHqtSerxdymGHNVpR7pXZ1tF/mI7JIsF+NFErmZJcW79pl7m5ZoZNR+SIDexdg1/IydduGwIDAQABo4IBnzCCAZswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFArEHsfdZvlpOxPguP9/En90/NMgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFcGA1UdEQRQME6CDmdpZHAuZ2VhbnQubmV0ghNpZHAxLmdpZHAuZ2VhbnQubmV0ghNpZHAyLmdpZHAuZ2VhbnQubmV0ghJ3d3cuZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAH56nltzImiMVOv5DJxcTo2cpGBWPO+OI7S1Ns76cS6PzWbkm/zjPPZI871Pfgw6n3Q3V3Kpc48hRyx3WPH/9nk+YnFEUjkjaRCzeWR6A2oYSb83iI2n/33+E2AmyZ1FX5E1nfxRtSBLYyHPdXYQ6A/TN4qtm/9QHrbcISPEQJwvJn4/BOQDrvsjZDJeq7Srrr2An//RpNdC9cA4wU+m0oJPbPHGl32ENO6JVK7gJPYw2WBDER1SMwAEThtUthQyZhp1z6jA/hoeHfM4QR2/mT458LpRXs1c5VGAeC+4pjfJ4skXAU17Nq+ut8+fJMjjQSXOpv10kS2jNq2XfPmN+K4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">GEANT SP Proxy</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="false"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="false"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName" isRequired="false"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="false"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GEANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>edugain-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..123687d6
--- /dev/null
+++ b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Logga in i Inslaget - Karlstads universitet intranät</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Login to Inslaget - Karlstad University intranet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Karlstads universitets nya intranät baserad på Drupal Commons</mdui:Description>
+        <mdui:Description xml:lang="en">This is the new intranet at Karlstad University based upon Drupal Commons</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjzCCAnegAwIBAgIJAIn6ZE6NtXiwMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRwwGgYDVQQDDBNnb2xkaW5ncy5zYWUua2F1LnNlMB4XDTE0MDEyMzA5Mjc0M1oXDTI0MDEyMzA5Mjc0M1owXjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEthcmxzdGFkMR4wHAYDVQQKDBVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxHDAaBgNVBAMME2dvbGRpbmdzLnNhZS5rYXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCye8mEKh2KWatOVQtc+al7HROq93Y0PS9c+1LCs8gd+KKHSchJDUITWMXr1SoyH8cZbWTY1kZdOSdkZEImg0rJoGpLceRQtnnZCZuCaMr/BKIsvZxTbYCKt1sCO8jfLaESF0Q/qb6rjgnrxppvREr6w2FCisMp+4Micc80ZyFx0GGkABIFRtK3f3no3dOAszChVfNWMC1SESrBLgN9iQ1/Pc6rnlo1Ixy6oqlzY+CEUxc6P+A1jy04YNVdgAyS888b8lBimKJyup1tYIwULhka49LanBF/YatOcsutc/+sM9JPtQjeasU3rgBwrzztNAmCOMAfC1LaLUpTFMRl9hxPAgMBAAGjUDBOMB0GA1UdDgQWBBSUpNdkj+k7C8VB/GL0gPYwTAcT+jAfBgNVHSMEGDAWgBSUpNdkj+k7C8VB/GL0gPYwTAcT+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBDq1MB2AIFI/R1GjSHSVJyUPZF8I32X/cNDjyRQ0aITKwWLNGhqW0JHR+In6I9sRJckQF7zPgm/Uoc2tnVWJJZJ6JHTQ99/1oD6Q0Lupj/fqK9OdDB5bhCph6q1kc0ioTvcrTcNs7fM6GNG+kYpehdBO/HDeM23IMHanzWX41BZWviiB15FCe/wENnp62s1Iq420aWPrW5JnR1nfX+7jQudsLQigejPVP4TO1V35PQIuxVsjI6WX3Ltqk1lGyR8gl6LEKOGgeNltArJN5wsEmVsP/JsgeC3uxtXewMsQwGwsOY6/PmyiUnIPVBhAtHx/2fvnj96plcTuwYcIOm1aD1</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjzCCAnegAwIBAgIJAIn6ZE6NtXiwMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRwwGgYDVQQDDBNnb2xkaW5ncy5zYWUua2F1LnNlMB4XDTE0MDEyMzA5Mjc0M1oXDTI0MDEyMzA5Mjc0M1owXjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEthcmxzdGFkMR4wHAYDVQQKDBVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxHDAaBgNVBAMME2dvbGRpbmdzLnNhZS5rYXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCye8mEKh2KWatOVQtc+al7HROq93Y0PS9c+1LCs8gd+KKHSchJDUITWMXr1SoyH8cZbWTY1kZdOSdkZEImg0rJoGpLceRQtnnZCZuCaMr/BKIsvZxTbYCKt1sCO8jfLaESF0Q/qb6rjgnrxppvREr6w2FCisMp+4Micc80ZyFx0GGkABIFRtK3f3no3dOAszChVfNWMC1SESrBLgN9iQ1/Pc6rnlo1Ixy6oqlzY+CEUxc6P+A1jy04YNVdgAyS888b8lBimKJyup1tYIwULhka49LanBF/YatOcsutc/+sM9JPtQjeasU3rgBwrzztNAmCOMAfC1LaLUpTFMRl9hxPAgMBAAGjUDBOMB0GA1UdDgQWBBSUpNdkj+k7C8VB/GL0gPYwTAcT+jAfBgNVHSMEGDAWgBSUpNdkj+k7C8VB/GL0gPYwTAcT+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBDq1MB2AIFI/R1GjSHSVJyUPZF8I32X/cNDjyRQ0aITKwWLNGhqW0JHR+In6I9sRJckQF7zPgm/Uoc2tnVWJJZJ6JHTQ99/1oD6Q0Lupj/fqK9OdDB5bhCph6q1kc0ioTvcrTcNs7fM6GNG+kYpehdBO/HDeM23IMHanzWX41BZWviiB15FCe/wENnp62s1Iq420aWPrW5JnR1nfX+7jQudsLQigejPVP4TO1V35PQIuxVsjI6WX3Ltqk1lGyR8gl6LEKOGgeNltArJN5wsEmVsP/JsgeC3uxtXewMsQwGwsOY6/PmyiUnIPVBhAtHx/2fvnj96plcTuwYcIOm1aD1</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT-avdelningen</md:GivenName>
+    <md:EmailAddress>webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml b/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..d0b8e327
--- /dev/null
+++ b/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok-test.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok-test.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok-test.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-test-ladok1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-test-ladok1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAMVcirJT+6VyMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGxwd3Rvb2wtdGVzdC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwNDE5MTMxMDQ4
+WhcNMjAwNDE2MTMxMDQ4WjAnMSUwIwYDVQQDExxscHd0b29sLXRlc3QtbGFkb2sx
+Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Ri0W5ti
+3fLLdRMqqHTATq3B5kJ4Ys1pNbq/QXFrBtC6z9cvkkA0Bo4K4rMos5ddrwfkHWI+
+5PFJGRxeJnmzGR4S13pQ2xRTcrUKGxosnfYFUAG0y3ySDUjH/O4eU+nBmqQA5yRQ
+RYZ6O1sBN++soWRPSvDekiN5qUhjIbVKTriMPmgwWgB1NgpBuedU72l2mkakw/Eb
+X8lfkLs3gKlipttf4mHSc1OHrRGFvEfUiXQPtft4TURcSWF2w8ZF7OvOFaytQ5B8
+T1LGXx+meuzw36MSvsWiJ66mLTeCelrQmEIPNyTDU0PR8asUKI6wL3ZqW7fi/QdL
+x+OVozQUqLcpkQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXRlc3QtbGFk
+b2sxLml0LnN1LnNlMB0GA1UdDgQWBBTva47ARyx1kRrWDD9X9QK60b14SjANBgkq
+hkiG9w0BAQUFAAOCAQEAkWsA6bZZhjoVIL73BLyQ9vgZ33oey/wed0DzuGAJjJw8
+lFPoS1pO7dhSBGzoAqE6ZQAKgnt/1TERx6QsRCAV7zK2KqxDty+4UbHBgm/44zx/
+0xf68ag4URas3zoVT8iNf0/CcuZAbQ07pDO2fN0utS7vj9XuTyyViu4rMXhilNNw
+q1zkyPJTFmWA+NnWjVQrbM4Z6TJd4ImhLcItPySQDol17n7NCIWOUWIxWGjSX6Xu
+h3J6sZ7bOI4N1bWlNUIKoqzjWniHt0+6VwsmZ+XZOVgNnDkHQmta4y9/jmTbm4Vv
+fPPBQCZRQrV5zV0+mNOLgZEjYh4zXLJOA4dDFYq2gg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-test-ladok1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-test-ladok1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAMVcirJT+6VyMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGxwd3Rvb2wtdGVzdC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwNDE5MTMxMDQ4
+WhcNMjAwNDE2MTMxMDQ4WjAnMSUwIwYDVQQDExxscHd0b29sLXRlc3QtbGFkb2sx
+Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Ri0W5ti
+3fLLdRMqqHTATq3B5kJ4Ys1pNbq/QXFrBtC6z9cvkkA0Bo4K4rMos5ddrwfkHWI+
+5PFJGRxeJnmzGR4S13pQ2xRTcrUKGxosnfYFUAG0y3ySDUjH/O4eU+nBmqQA5yRQ
+RYZ6O1sBN++soWRPSvDekiN5qUhjIbVKTriMPmgwWgB1NgpBuedU72l2mkakw/Eb
+X8lfkLs3gKlipttf4mHSc1OHrRGFvEfUiXQPtft4TURcSWF2w8ZF7OvOFaytQ5B8
+T1LGXx+meuzw36MSvsWiJ66mLTeCelrQmEIPNyTDU0PR8asUKI6wL3ZqW7fi/QdL
+x+OVozQUqLcpkQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXRlc3QtbGFk
+b2sxLml0LnN1LnNlMB0GA1UdDgQWBBTva47ARyx1kRrWDD9X9QK60b14SjANBgkq
+hkiG9w0BAQUFAAOCAQEAkWsA6bZZhjoVIL73BLyQ9vgZ33oey/wed0DzuGAJjJw8
+lFPoS1pO7dhSBGzoAqE6ZQAKgnt/1TERx6QsRCAV7zK2KqxDty+4UbHBgm/44zx/
+0xf68ag4URas3zoVT8iNf0/CcuZAbQ07pDO2fN0utS7vj9XuTyyViu4rMXhilNNw
+q1zkyPJTFmWA+NnWjVQrbM4Z6TJd4ImhLcItPySQDol17n7NCIWOUWIxWGjSX6Xu
+h3J6sZ7bOI4N1bWlNUIKoqzjWniHt0+6VwsmZ+XZOVgNnDkHQmta4y9/jmTbm4Vv
+fPPBQCZRQrV5zV0+mNOLgZEjYh4zXLJOA4dDFYq2gg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok.su.se-shibboleth.sso.xml b/swamid-2.0/ladok.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..02b43720
--- /dev/null
+++ b/swamid-2.0/ladok.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-prod-ladok1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-prod-ladok1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAKAlvioJS4MwMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGxwd3Rvb2wtcHJvZC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwMjI0MTU0NTUy
+WhcNMjAwMjIyMTU0NTUyWjAnMSUwIwYDVQQDExxscHd0b29sLXByb2QtbGFkb2sx
+Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAseNPMakP
+gEk64DPwWm63DxiReYuQTvgZqSZHZDS/5XjpgWsFcG/at4fEnymd21lL0YVDJq3D
+a1ERNofKiPnDGWa84wzlZIEF4EG72I7hZkX/rLnXU6jaoUfI4umX0hdCySNJGRAR
+f6CyTaSyLp8lfI44DwHrtR76oo/8FZ/+/i5u2cosSBK6S9eZ+JVMYnvgeXNmO2/W
+1vgBq2JRQmxjKON1Os73jz/z/cr0wIbil8Adl9zmRjKebwrVZpgh2/90vkCL/JR0
+FpcbHZuPlwVkydk8aaeRmmThcNl3AHbjMQ1BBOFxKgTDX499JKk2GnVwGP6KpeVH
+IZf+JpCs8Y1vIQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXByb2QtbGFk
+b2sxLml0LnN1LnNlMB0GA1UdDgQWBBSsRm1AtkLKxRbwQnzJJgzdBGnzRjANBgkq
+hkiG9w0BAQUFAAOCAQEAIqWjPq4bS0KK38rA89JlY2snXM/Xp3GCxdqL/J6AIijX
+wAekdKoK1XRvQ6u/m2iPyDdS5dyLf89qqzIR4IY5XDWQaOPCUYMc+B0Rx0blg8JM
+TIzxu8I8K2lycbWlvY2JxE/4yROSay2gSB5NSm0iaH/dATuu+/p1+0Ntm+7VXXJ7
+3D7J621eGxC9fDcw7eM1PrezvXlVszyPk2Djb7lyXzHCxhhqlfFEm9Po2+Uw0AWS
+dVRlM1/Sf6CV2UYcaNPxvKg8An7pzvSVBruVpx1nbzD4zj9Cr/idPzAFmXB0Ikom
+R3H6+4G4tQJixe4WRSG0z0Z1inVFppE5WqimH/Cp4Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-prod-ladok1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-prod-ladok1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAKAlvioJS4MwMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGxwd3Rvb2wtcHJvZC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwMjI0MTU0NTUy
+WhcNMjAwMjIyMTU0NTUyWjAnMSUwIwYDVQQDExxscHd0b29sLXByb2QtbGFkb2sx
+Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAseNPMakP
+gEk64DPwWm63DxiReYuQTvgZqSZHZDS/5XjpgWsFcG/at4fEnymd21lL0YVDJq3D
+a1ERNofKiPnDGWa84wzlZIEF4EG72I7hZkX/rLnXU6jaoUfI4umX0hdCySNJGRAR
+f6CyTaSyLp8lfI44DwHrtR76oo/8FZ/+/i5u2cosSBK6S9eZ+JVMYnvgeXNmO2/W
+1vgBq2JRQmxjKON1Os73jz/z/cr0wIbil8Adl9zmRjKebwrVZpgh2/90vkCL/JR0
+FpcbHZuPlwVkydk8aaeRmmThcNl3AHbjMQ1BBOFxKgTDX499JKk2GnVwGP6KpeVH
+IZf+JpCs8Y1vIQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXByb2QtbGFk
+b2sxLml0LnN1LnNlMB0GA1UdDgQWBBSsRm1AtkLKxRbwQnzJJgzdBGnzRjANBgkq
+hkiG9w0BAQUFAAOCAQEAIqWjPq4bS0KK38rA89JlY2snXM/Xp3GCxdqL/J6AIijX
+wAekdKoK1XRvQ6u/m2iPyDdS5dyLf89qqzIR4IY5XDWQaOPCUYMc+B0Rx0blg8JM
+TIzxu8I8K2lycbWlvY2JxE/4yROSay2gSB5NSm0iaH/dATuu+/p1+0Ntm+7VXXJ7
+3D7J621eGxC9fDcw7eM1PrezvXlVszyPk2Djb7lyXzHCxhhqlfFEm9Po2+Uw0AWS
+dVRlM1/Sf6CV2UYcaNPxvKg8An7pzvSVBruVpx1nbzD4zj9Cr/idPzAFmXB0Ikom
+R3H6+4G4tQJixe4WRSG0z0Z1inVFppE5WqimH/Cp4Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lists.su.se-shibboleth.xml b/swamid-2.0/lists.su.se-shibboleth.xml
new file mode 100644
index 00000000..7ef17e8c
--- /dev/null
+++ b/swamid-2.0/lists.su.se-shibboleth.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.su.se/shibboleth">
+  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB1TCCAT6gAwIBAgIJAOsd1P/iHwDdMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2xpc3RzLnN1LnNlMB4XDTA4MDIxMjEyNTk0NVoXDTA5MDIxMTEyNTk0NVowFjEUMBIGA1UEAxMLbGlzdHMuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALnNTH6G15SgAwQHMCa9FLJ4g/MnmZ+2Q0m8ZvXA5OKoLY+7vpH7XrojM2/ziobcPK+pE5UNaNOpVffBUFtibabgXs2N7BUDJWjcvRqk5rxmEoMd1mCRQ6WOATBPdSkZ3xFvs0yy5y+1xRNsBji7gb326dHS/WUIDAw/62dCLG5PAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAH7Ml0chViQ1GTX4RkL/S8bJpELYqTNBZ7+s7wMOwPF/TxJKeC6yFCkFKx4Ts8uGuJ3Bo3MsetTTUe24WD5aRO76k6p7y/HPs+nk0e0VJKz3NSktKGE/uXt59B/ax1tdVOMuZTGV9GwwlgHOMapYOBylI7Nriufub8Cgtwf4VwgQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Stockholm university</Company>
+    <GivenName>Helpdesk</GivenName>
+    <EmailAddress>helpdesk@it.su.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml b/swamid-2.0/login.idp.eduid.se-idp.xml
new file mode 100644
index 00000000..6ee867bf
--- /dev/null
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.idp.eduid.se/idp.xml">
+  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
+        <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+        <mdui:Logo xml:lang="en" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
+      </mdui:UIInfo>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
+MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
+EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
+AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
+eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
+G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
+dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
+F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
+JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
+fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
+Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
+5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
+ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
+cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
+q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
+eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
+FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
+iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
+MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
+EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
+AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
+eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
+G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
+dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
+F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
+JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
+fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
+Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
+5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
+ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
+cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
+q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
+eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
+FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
+iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
+  </ns0:IDPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">eduID</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">eduID</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="administrative">
+    <ns0:Company>eduID</ns0:Company>
+    <ns0:SurName>Valter Nordh</ns0:SurName>
+    <ns0:EmailAddress>valter@sunet.se</ns0:EmailAddress>
+    <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:Company>eduID</ns0:Company>
+    <ns0:SurName>SUNET eduID team</ns0:SurName>
+    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="support">
+    <ns0:Company>eduID</ns0:Company>
+    <ns0:SurName>eduID Support</ns0:SurName>
+    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/mail.su.se-shibboleth.sso.xml b/swamid-2.0/mail.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..a866c60b
--- /dev/null
+++ b/swamid-2.0/mail.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mail.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mail.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mail.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>roundcube-prod-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=roundcube-prod-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAKyIh2gmx83lMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3JvdW5kY3ViZS1wcm9kLWFwcDEwHhcNMTAwMzEwMDY1MDEwWhcNMjAwMzA3
+MDY1MDEwWjAeMRwwGgYDVQQDExNyb3VuZGN1YmUtcHJvZC1hcHAxMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqQcHsxKbp/6oebHTLXzdUJ3beXgI66UD
++IMz3ltFPXKNjEOmBZbSUsRHiXyqMXXypqkHTufMDdDzGp8KQ81xUOSm16N4EYG5
+N33zwCw699XkW49FEmlMbJ1r6L88GGOTOVqFnk7geH+Hn7VI3/c3gjjO8L3qsv7R
+gDo6eULIUzRR29df7jowa8fjSvB6tOebxoED2SlYZeslxSIMcSjGzfo6byZlfFvo
+fJFxFefcHBV73Ez0YWL0nQiyOFfKNluLVW3W4Sp8GrCDbT64ye3Pymuj0fXRmMTl
+ABwcJUWojXGV1oRk8pnyws7kYlYwSLSYA9KOg48OQSbGrzcfSYAicQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNyb3VuZGN1YmUtcHJvZC1hcHAxMB0GA1UdDgQWBBQkl1j6
+iaF51HGr51+b9C6U4zYwpzANBgkqhkiG9w0BAQUFAAOCAQEAS2UGp0Tx4abtIYaK
+PmoBv63ynkPHkumYgkhO81aHGAcrgpAENHtGOUHVMnQ+dry+joasnxBps97mKlGO
+xNPGHi4js6lBauyW6UoK1bwEaJXugEwEBE0HXfarmiwRPXXBzIZlimYtmAxRyx4E
+nc8VVfNxoWyrR2g/SI3G2CFRST+o2Lx78D4suv75mY4YwLFxBs40Jy3R7TiOo5PL
+RgQ1tCNvR9FBFaPiO2lw+8eTurIoDP3zmIs7XmuF5iB+1SI3T+1PRWY+z0j48OeK
+Uv08MaF6TarxsVvf1bmG5pJEQjKKU4LzQLP/cV9FAj1bWn9nWy5sw88rYdh7JOtj
+pCVWIw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>roundcube-prod-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=roundcube-prod-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAKyIh2gmx83lMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3JvdW5kY3ViZS1wcm9kLWFwcDEwHhcNMTAwMzEwMDY1MDEwWhcNMjAwMzA3
+MDY1MDEwWjAeMRwwGgYDVQQDExNyb3VuZGN1YmUtcHJvZC1hcHAxMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqQcHsxKbp/6oebHTLXzdUJ3beXgI66UD
++IMz3ltFPXKNjEOmBZbSUsRHiXyqMXXypqkHTufMDdDzGp8KQ81xUOSm16N4EYG5
+N33zwCw699XkW49FEmlMbJ1r6L88GGOTOVqFnk7geH+Hn7VI3/c3gjjO8L3qsv7R
+gDo6eULIUzRR29df7jowa8fjSvB6tOebxoED2SlYZeslxSIMcSjGzfo6byZlfFvo
+fJFxFefcHBV73Ez0YWL0nQiyOFfKNluLVW3W4Sp8GrCDbT64ye3Pymuj0fXRmMTl
+ABwcJUWojXGV1oRk8pnyws7kYlYwSLSYA9KOg48OQSbGrzcfSYAicQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNyb3VuZGN1YmUtcHJvZC1hcHAxMB0GA1UdDgQWBBQkl1j6
+iaF51HGr51+b9C6U4zYwpzANBgkqhkiG9w0BAQUFAAOCAQEAS2UGp0Tx4abtIYaK
+PmoBv63ynkPHkumYgkhO81aHGAcrgpAENHtGOUHVMnQ+dry+joasnxBps97mKlGO
+xNPGHi4js6lBauyW6UoK1bwEaJXugEwEBE0HXfarmiwRPXXBzIZlimYtmAxRyx4E
+nc8VVfNxoWyrR2g/SI3G2CFRST+o2Lx78D4suv75mY4YwLFxBs40Jy3R7TiOo5PL
+RgQ1tCNvR9FBFaPiO2lw+8eTurIoDP3zmIs7XmuF5iB+1SI3T+1PRWY+z0j48OeK
+Uv08MaF6TarxsVvf1bmG5pJEQjKKU4LzQLP/cV9FAj1bWn9nWy5sw88rYdh7JOtj
+pCVWIw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mail.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mail.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mail.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mail.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml b/swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..3c8e72dd
--- /dev/null
+++ b/swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml
@@ -0,0 +1,92 @@
+<?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://minastudier-test.su.se/Shibboleth.sso">
+  <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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastudier-test.su.se/Shibboleth.sso/WAYF/idp-test.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastudier-test.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastudier-test.su.se/Shibboleth.sso/WAYF"/>
+      <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://minastudier-test.su.se/Shibboleth.sso/WAYF" 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://minastudier-test.su.se/Shibboleth.sso/WAYF/wavelan"/>
+      <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://minastudier-test.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastudier-test.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastudier-test.su.se/Shibboleth.sso/SWAMID"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Mina Studier är en tjänst för studenter</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">My Studies is a service for students</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">En tjänst vid Stockholms universitet</mdui:Description>
+        <mdui:Description xml:lang="en">A service at Stockholm University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-mstest-sp01</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-mstest-sp01</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJalLGXlzrucMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2xwd3Rvb2wtbXN0ZXN0LXNwMDEwHhcNMTUwNTA2MTIxMjUxWhcNMjUwNTAz
+MTIxMjUxWjAeMRwwGgYDVQQDExNscHd0b29sLW1zdGVzdC1zcDAxMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArNRHDHOKP1CUDuDW/85MifgZ8Ho/cOKP
+9orjRrjr0YUsM6x2HXooxCkpdTOcCaPPJtr1lP4tGtqPCWXjchyxX0HrIWqe7kWT
+W1DkE3Iv6SmgaI+7J6OBCDuuy0E2A7z0n9MnZE3iM2ICR9j8gUFkBGT3rHD7ZJ6J
+mQkSw8CsHMx5b3ASNHtmbhIdtCGM/POKgUWcK31Ef3GEhulPUogJ8+QmRND8C5oy
+cG6ObaVHy9JZ+y3nlEkKQxdgIpBO/PwkYd7WkPvHtm4enzXE3VIftTrdcbRPKC0Q
+goB8gncZS9LXtrirrQyfdHyvdoO5a09dx7QO3i8hG41EfZfZup2DnwIDAQABo0Ew
+PzAeBgNVHREEFzAVghNscHd0b29sLW1zdGVzdC1zcDAxMB0GA1UdDgQWBBTc7nW/
+1CG97xuDpga/x7OolZkWRjANBgkqhkiG9w0BAQUFAAOCAQEAGRXo6GCdHfkgSbI6
+xUJamYO1uw9Ao5bCARgIDVwBxKn9Ui4HgEiIROJfCV3+w5d7b9ipek6AXUOv90yH
+Uxf1GR+M5VMC71AimByyIaRv8LjG34IxGgpCgMWilyAs13V9BQLSau4SMCtMhPI6
++1lf3ECSO7pA98p34uGuEwFNCQ7QSOAaNjHz8b1znghRWzZO7XBJnF9fcsWem4ID
+XYCIfPsH3AqPrFK+RjXdaQGe0NLYTi/bgbFT3nmskF2rHwi8KILTZg2YXOldA9N7
+ai7Ak2EMywr/CkuMVSwv0HzkxGfNu+ef7E+SUOs/uNwGk4jLNravN2pM8ulUIb4X
+5yOvLg==
+</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://minastudier-test.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier-test.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier-test.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier-test.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier-test.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier-test.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier-test.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier-test.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier-test.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/minastudier.su.se-shibboleth.sso.xml b/swamid-2.0/minastudier.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..f51430bf
--- /dev/null
+++ b/swamid-2.0/minastudier.su.se-shibboleth.sso.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minastudier.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-prod-minastudier1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-prod-minastudier1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIJALTp+wTwop0PMA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
+BAMTImxwd3Rvb2wtcHJvZC1taW5hc3R1ZGllcjEuaXQuc3Uuc2UwHhcNMTAwMjI0
+MTU1MTU1WhcNMjAwMjIyMTU1MTU1WjAtMSswKQYDVQQDEyJscHd0b29sLXByb2Qt
+bWluYXN0dWRpZXIxLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAx59TlYR92Fuzux/IiWYU3rv/fByvOlbCtiIFyfyLsV//YayVDv/mICYc
+/AiWxDW/Tq7rw1z/rgXvyYldvGjSuV2jOtpDVOIbTKHcZn8O9yWw15g3Xc4ACLTN
+/SGQPL93m3qkyDFGDntrJwrPbg+SDAQG/NzYtPOQ8yWA8d62kwn9DOxgd7HumZoi
+8I+PGxp1Z4A1+SisHonXoSmhwwX6P8btKB3c/2hYLaoikICDXT707K0E61oHbSf3
+jpCGV+MeFEemaPOj0FxrH3LJ4ofGuzaToIo1b9eGBNz9YoC4q/EWxqb78jpPw8bp
+c7tj7lqftz9JbMvxPwUZHq9noFfpgwIDAQABo1AwTjAtBgNVHREEJjAkgiJscHd0
+b29sLXByb2QtbWluYXN0dWRpZXIxLml0LnN1LnNlMB0GA1UdDgQWBBTHi0oC+SaS
+VSASMRoOhZSb6u+L8DANBgkqhkiG9w0BAQUFAAOCAQEAvQ5BaMnza3JwJJu+V5UF
+U1ZYvCBn/TWc7ALet4xVcTdoxgq5FiKw8reYWGtijL5Yoi/V/roFFuiyjSeQYhKq
+6Vr7KmHktnsJn+/cQpzbyjBqo3LTaBtYqbucXlZrpkyy0e1Ia8aijNgbP1acvWfM
+oxvaNaulccXcbDc+x7XU51ihKeTg9UthoE6SBKyWdlCjJOJ7n/K4CHVegD0nVST3
+mcNaiB+aLmlSoII63FqK3VMRBmrlTQ1C3ab25fTDxlg/5NC6mVZbcDAe4poIReLo
+a9ooP6ZBaNOCD9BevPOlcZZGPGZBB8XOnZS8uREdpxtGAgucwZEchAru2lrYxzEV
+pA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-prod-minastudier1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-prod-minastudier1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIJALTp+wTwop0PMA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
+BAMTImxwd3Rvb2wtcHJvZC1taW5hc3R1ZGllcjEuaXQuc3Uuc2UwHhcNMTAwMjI0
+MTU1MTU1WhcNMjAwMjIyMTU1MTU1WjAtMSswKQYDVQQDEyJscHd0b29sLXByb2Qt
+bWluYXN0dWRpZXIxLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAx59TlYR92Fuzux/IiWYU3rv/fByvOlbCtiIFyfyLsV//YayVDv/mICYc
+/AiWxDW/Tq7rw1z/rgXvyYldvGjSuV2jOtpDVOIbTKHcZn8O9yWw15g3Xc4ACLTN
+/SGQPL93m3qkyDFGDntrJwrPbg+SDAQG/NzYtPOQ8yWA8d62kwn9DOxgd7HumZoi
+8I+PGxp1Z4A1+SisHonXoSmhwwX6P8btKB3c/2hYLaoikICDXT707K0E61oHbSf3
+jpCGV+MeFEemaPOj0FxrH3LJ4ofGuzaToIo1b9eGBNz9YoC4q/EWxqb78jpPw8bp
+c7tj7lqftz9JbMvxPwUZHq9noFfpgwIDAQABo1AwTjAtBgNVHREEJjAkgiJscHd0
+b29sLXByb2QtbWluYXN0dWRpZXIxLml0LnN1LnNlMB0GA1UdDgQWBBTHi0oC+SaS
+VSASMRoOhZSb6u+L8DANBgkqhkiG9w0BAQUFAAOCAQEAvQ5BaMnza3JwJJu+V5UF
+U1ZYvCBn/TWc7ALet4xVcTdoxgq5FiKw8reYWGtijL5Yoi/V/roFFuiyjSeQYhKq
+6Vr7KmHktnsJn+/cQpzbyjBqo3LTaBtYqbucXlZrpkyy0e1Ia8aijNgbP1acvWfM
+oxvaNaulccXcbDc+x7XU51ihKeTg9UthoE6SBKyWdlCjJOJ7n/K4CHVegD0nVST3
+mcNaiB+aLmlSoII63FqK3VMRBmrlTQ1C3ab25fTDxlg/5NC6mVZbcDAe4poIReLo
+a9ooP6ZBaNOCD9BevPOlcZZGPGZBB8XOnZS8uREdpxtGAgucwZEchAru2lrYxzEV
+pA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://minastudier.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://minastudier.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mondo-web.it.su.se-shibboleth.xml b/swamid-2.0/mondo-web.it.su.se-shibboleth.xml
new file mode 100644
index 00000000..e6b83993
--- /dev/null
+++ b/swamid-2.0/mondo-web.it.su.se-shibboleth.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo-web.it.su.se/shibboleth">
+  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB4zCCAUygAwIBAgIJAN5zNlbssq13MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEm1vbmRvLXdlYi5pdC5zdS5zZTAeFw0wODA0MDIwNzI3MTZaFw0xNjA2MTkwNzI3MTZaMB0xGzAZBgNVBAMTEm1vbmRvLXdlYi5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA92ZD35RNWkg5x8yaykgO4gAU2j7VPrCfl9ut461Tai9XFRyK+OWp5Ln+hXguW7VylGTfcEbOjjh51gAvxX310OwiohlLXmnBdwjfMmIhv8tOjHOjlZQSuYSGC0TFCvHJu/9cvJ285S1Itcg0iqTZWhC7fOlXyEBCTBTC5dHZr2sCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQDtazBSwFaLjM2ac/Zup8SCVouGN10jYpvpMfLZWtiThdLJS1Q0q2ayq91V8kMp02Y1Wt3ruZNbC3SE0U5CvAX/KpJaYuaFJWJO7YXvfeIJwau3ZmTG4CFlf0mjd419TWErju6PXeo6wcsmaZ6vEuse7fj3596LiC6sXwry+nNzUg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mondo-web.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Stockholm university</Company>
+    <SurName>IT och media Helpdesk</SurName>
+    <EmailAddress>helpdesk@it.su.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/monitor.it.su.se-shibboleth.sso.xml b/swamid-2.0/monitor.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..ebaa10b0
--- /dev/null
+++ b/swamid-2.0/monitor.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://monitor.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://monitor.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nagios-prod-srv1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nagios-prod-srv1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOjt6rzBfzawMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEG5hZ2lvcy1wcm9kLXNydjEwHhcNMTAxMDA4MTIxNjQ3WhcNMjAxMDA1MTIx
+NjQ3WjAbMRkwFwYDVQQDExBuYWdpb3MtcHJvZC1zcnYxMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm0YI4BA9yAlw1OR1iEw+SWEfTyzg4U+5edMX/jUQ
+HznWGDU3RHHyG9lvOvHEmiRVUawG26j1hfpRTSyTAgzMPp5LQlAzHEqFXIWRly5Z
+8ev2ypkQLo5Jf5Y9j3Hs8X9JFQ+ArCUVszhhSwl3yzOmGhXPifD0o4Q//OI1ITew
+9fMlHKQzwcOgqqhu4Ouy4FElZ1GWxgskWFzOfnzGE/PbSdpgQhldI129qlNpnS70
+8DD12mP/OYP5pPmIfHSfNbydcKFWGup7fPNt8i2Qd4r6QmTFiGUI4u3wuPGFqgEQ
+mQma6hitoUjsnlXXlf9yeereaS1Rywvx7nECxEZEFSWMuwIDAQABoz4wPDAbBgNV
+HREEFDASghBuYWdpb3MtcHJvZC1zcnYxMB0GA1UdDgQWBBRj48nOGnAtBpcMK+w/
+DaOIPELzpDANBgkqhkiG9w0BAQUFAAOCAQEAFfJMTymD6HJtfAu6gvTyqRWU0P1T
+8CxgZn0kdErCTgUE4cH15D+38hZXZ6pTVxP05y+Hu/gxvzE/CUPy5aKdR9gVa3yh
+fEhPw06y7JDNxVVT7vcmWhmpI31mcIJmPwaWzh4BMC8uZPnBLJVSCgCrTJATZqj1
+zPyTGrXypLJNWErR2Rg5LOToWyItrWVOt2J9Lmt10lZG3O/q7UBWrdhqS9Yv5SUz
+PwDj/1Z21tcFe2iY5jrqJSbP4WURR4h9nPPgcbbExlKddAqm1bNV4CX4m+xjkGDX
+M1QL2iqLjZ5itEAcf2eT0T4jr1zPcprELLxcai13KiAIwOndIBfzhApcFw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nagios-prod-srv1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nagios-prod-srv1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOjt6rzBfzawMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEG5hZ2lvcy1wcm9kLXNydjEwHhcNMTAxMDA4MTIxNjQ3WhcNMjAxMDA1MTIx
+NjQ3WjAbMRkwFwYDVQQDExBuYWdpb3MtcHJvZC1zcnYxMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm0YI4BA9yAlw1OR1iEw+SWEfTyzg4U+5edMX/jUQ
+HznWGDU3RHHyG9lvOvHEmiRVUawG26j1hfpRTSyTAgzMPp5LQlAzHEqFXIWRly5Z
+8ev2ypkQLo5Jf5Y9j3Hs8X9JFQ+ArCUVszhhSwl3yzOmGhXPifD0o4Q//OI1ITew
+9fMlHKQzwcOgqqhu4Ouy4FElZ1GWxgskWFzOfnzGE/PbSdpgQhldI129qlNpnS70
+8DD12mP/OYP5pPmIfHSfNbydcKFWGup7fPNt8i2Qd4r6QmTFiGUI4u3wuPGFqgEQ
+mQma6hitoUjsnlXXlf9yeereaS1Rywvx7nECxEZEFSWMuwIDAQABoz4wPDAbBgNV
+HREEFDASghBuYWdpb3MtcHJvZC1zcnYxMB0GA1UdDgQWBBRj48nOGnAtBpcMK+w/
+DaOIPELzpDANBgkqhkiG9w0BAQUFAAOCAQEAFfJMTymD6HJtfAu6gvTyqRWU0P1T
+8CxgZn0kdErCTgUE4cH15D+38hZXZ6pTVxP05y+Hu/gxvzE/CUPy5aKdR9gVa3yh
+fEhPw06y7JDNxVVT7vcmWhmpI31mcIJmPwaWzh4BMC8uZPnBLJVSCgCrTJATZqj1
+zPyTGrXypLJNWErR2Rg5LOToWyItrWVOt2J9Lmt10lZG3O/q7UBWrdhqS9Yv5SUz
+PwDj/1Z21tcFe2iY5jrqJSbP4WURR4h9nPPgcbbExlKddAqm1bNV4CX4m+xjkGDX
+M1QL2iqLjZ5itEAcf2eT0T4jr1zPcprELLxcai13KiAIwOndIBfzhApcFw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://monitor.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://monitor.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://monitor.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://monitor.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml b/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..57cf2f16
--- /dev/null
+++ b/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nagios.dev.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.dev.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.dev.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nagios-dev-srv1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nagios-dev-srv1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAKnYXsrhSwHBMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD25hZ2lvcy1kZXYtc3J2MTAeFw0xMDA4MzAxMDUyNDVaFw0yMDA4MjcxMDUy
+NDVaMBoxGDAWBgNVBAMTD25hZ2lvcy1kZXYtc3J2MTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANHbXJZ0VNMBs8zN1tZwkxHAJpxuSg/JPnOHOhuzCx0z
+xfkarAYJ4sY0QPecNo8i8kxcTSq6L36zyQom8cZKZFCYcFRnVAXuuceuQ6977gwA
+9WCbPzpSHK5qB80JO2YCIv1Va+cSNifxOQLEdvAjks9BGaDrN4xA5xW8P01BNN1S
+TZW8yj88nul0tyjQDI6Jgb4S3O0AjraiJBJxQE89evV4lq6bmmwoaTyomOMxnytQ
+IbI4kgAPPdwkyzBlodl0+NbJy2dKHbCc+UPTu3zw5Kzt21bgGvun2JU+rCCfDmuS
+Hyy2710uKDpTKPCfBwZONbiWry873xM7aKjNArgogt8CAwEAAaM9MDswGgYDVR0R
+BBMwEYIPbmFnaW9zLWRldi1zcnYxMB0GA1UdDgQWBBSVHHWbwLoIYFfcxKwLZKZo
+TYK9FTANBgkqhkiG9w0BAQUFAAOCAQEAPYN+TPc5YGPKYaoV1t6A+Bur2wAq4l/z
+ZAFZ+RpHIkqqf8GYzTYTwzSqCseA6sQ4+gWV6m4QZqDkDrBs3+bX8qKFMyPhHGF0
+B3Hv+NggykTQ91H+teU2S6HzdnzsZFKbGZPxUsxsAuLu3yC1pwbUD5z0zXmqQDL/
+Xl+dEJB7r1rZhxCqiEFltLGHy4W+FujwT6eY125zSPAcW5zRnEj/trlazPLy6xbL
+pu1WxSK20jmHhXLayahQbkim4P4KSiux7dwX1VFoG0zaBhPRFLxiCni+Jyuc8T3n
+52YI3OAimigmnolk/rjYbyszAgS+TTFzoc0yODkCWSEG0UVR1TRQow==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nagios-dev-srv1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nagios-dev-srv1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAKnYXsrhSwHBMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD25hZ2lvcy1kZXYtc3J2MTAeFw0xMDA4MzAxMDUyNDVaFw0yMDA4MjcxMDUy
+NDVaMBoxGDAWBgNVBAMTD25hZ2lvcy1kZXYtc3J2MTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANHbXJZ0VNMBs8zN1tZwkxHAJpxuSg/JPnOHOhuzCx0z
+xfkarAYJ4sY0QPecNo8i8kxcTSq6L36zyQom8cZKZFCYcFRnVAXuuceuQ6977gwA
+9WCbPzpSHK5qB80JO2YCIv1Va+cSNifxOQLEdvAjks9BGaDrN4xA5xW8P01BNN1S
+TZW8yj88nul0tyjQDI6Jgb4S3O0AjraiJBJxQE89evV4lq6bmmwoaTyomOMxnytQ
+IbI4kgAPPdwkyzBlodl0+NbJy2dKHbCc+UPTu3zw5Kzt21bgGvun2JU+rCCfDmuS
+Hyy2710uKDpTKPCfBwZONbiWry873xM7aKjNArgogt8CAwEAAaM9MDswGgYDVR0R
+BBMwEYIPbmFnaW9zLWRldi1zcnYxMB0GA1UdDgQWBBSVHHWbwLoIYFfcxKwLZKZo
+TYK9FTANBgkqhkiG9w0BAQUFAAOCAQEAPYN+TPc5YGPKYaoV1t6A+Bur2wAq4l/z
+ZAFZ+RpHIkqqf8GYzTYTwzSqCseA6sQ4+gWV6m4QZqDkDrBs3+bX8qKFMyPhHGF0
+B3Hv+NggykTQ91H+teU2S6HzdnzsZFKbGZPxUsxsAuLu3yC1pwbUD5z0zXmqQDL/
+Xl+dEJB7r1rZhxCqiEFltLGHy4W+FujwT6eY125zSPAcW5zRnEj/trlazPLy6xbL
+pu1WxSK20jmHhXLayahQbkim4P4KSiux7dwX1VFoG0zaBhPRFLxiCni+Jyuc8T3n
+52YI3OAimigmnolk/rjYbyszAgS+TTFzoc0yODkCWSEG0UVR1TRQow==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.dev.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/order.kib.ki.se-shibboleth.xml b/swamid-2.0/order.kib.ki.se-shibboleth.xml
new file mode 100644
index 00000000..9ad9a2d1
--- /dev/null
+++ b/swamid-2.0/order.kib.ki.se-shibboleth.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://order.kib.ki.se/shibboleth">
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://order.kib.ki.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>order3.cb.ad</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=order3.cb.ad</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAKiPmXgb0jZdMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDG9yZGVyMy5jYi5hZDAeFw0wOTAyMTAxMjM5MzZaFw0xOTAyMDgxMjM5MzZa
+MBcxFTATBgNVBAMTDG9yZGVyMy5jYi5hZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL/0D/AlkYaW6kkDFE4cpyrTF9qSqTxeaMiiHUdjw0BAq4eH/pH/
+9asVrtl5OkNK4GRP5Grwu1Ebxu7E53etjJXnn2IHpXrDlDmfrRRhcbV4KSJrFytW
+kBXHgBvGa/R9FLyJdBSvmNO/LY0TtrZXA6Jh/ZsMxChqSMp4QqRjUv9ftCFOZr0c
+MMUQuYAZC74CwCzjD59S/u1EVgd1oj1mvk4qt/Znl5Y4UNu8Nwgvp29xXgyGC3O0
+N6ZPV2/x5aofl6rWeTiGBUBLNPV41lPIoHpAxU0mdH++FRI5EFKeIZhKKDKUFCtm
+G0nsgaMX7YUWzDas3wWZGv+bP/tGfvL7Z6ECAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+b3JkZXIzLmNiLmFkMB0GA1UdDgQWBBSXh8MggMc1hc/5JyvrlEPbZja5PDANBgkq
+hkiG9w0BAQUFAAOCAQEATJHWhMNioZKtvdDzH2IJfMecvSHxZwdg26tfLmriOJvb
+t5cJkdRcQWX74TarAoTgnQOHa4CcE6vYM0I+ihny+xxPz7uCbuwJr05qEImWnloq
+0/qLrVNVvnvQTiKWLrtm7Uew5djgf1qL1SMuHM9DOjTo0gs4YDLztDbYkBvFTA76
+0EjTdV5FU94cL+Mw/Laug0wouLqWuT77Zyc5WluQlfaS0MpQLac2qdLZNtnK+L3d
+RJm+DQbWtEH144Z3nMzk8jbylRWrrWYKFgg+6OhuwKr3AhtDvJpJoZSBJHEHFJoG
+ZnpMbRDL4QVlO6/nMZjUzttWoq+9rjmPowjbgd3RtQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>order3.cb.ad</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=order3.cb.ad</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAKiPmXgb0jZdMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDG9yZGVyMy5jYi5hZDAeFw0wOTAyMTAxMjM5MzZaFw0xOTAyMDgxMjM5MzZa
+MBcxFTATBgNVBAMTDG9yZGVyMy5jYi5hZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL/0D/AlkYaW6kkDFE4cpyrTF9qSqTxeaMiiHUdjw0BAq4eH/pH/
+9asVrtl5OkNK4GRP5Grwu1Ebxu7E53etjJXnn2IHpXrDlDmfrRRhcbV4KSJrFytW
+kBXHgBvGa/R9FLyJdBSvmNO/LY0TtrZXA6Jh/ZsMxChqSMp4QqRjUv9ftCFOZr0c
+MMUQuYAZC74CwCzjD59S/u1EVgd1oj1mvk4qt/Znl5Y4UNu8Nwgvp29xXgyGC3O0
+N6ZPV2/x5aofl6rWeTiGBUBLNPV41lPIoHpAxU0mdH++FRI5EFKeIZhKKDKUFCtm
+G0nsgaMX7YUWzDas3wWZGv+bP/tGfvL7Z6ECAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+b3JkZXIzLmNiLmFkMB0GA1UdDgQWBBSXh8MggMc1hc/5JyvrlEPbZja5PDANBgkq
+hkiG9w0BAQUFAAOCAQEATJHWhMNioZKtvdDzH2IJfMecvSHxZwdg26tfLmriOJvb
+t5cJkdRcQWX74TarAoTgnQOHa4CcE6vYM0I+ihny+xxPz7uCbuwJr05qEImWnloq
+0/qLrVNVvnvQTiKWLrtm7Uew5djgf1qL1SMuHM9DOjTo0gs4YDLztDbYkBvFTA76
+0EjTdV5FU94cL+Mw/Laug0wouLqWuT77Zyc5WluQlfaS0MpQLac2qdLZNtnK+L3d
+RJm+DQbWtEH144Z3nMzk8jbylRWrrWYKFgg+6OhuwKr3AhtDvJpJoZSBJHEHFJoG
+ZnpMbRDL4QVlO6/nMZjUzttWoq+9rjmPowjbgd3RtQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://order.kib.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..6b78cb29
--- /dev/null
+++ b/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-komm-admin.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-komm-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-komm-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAIL1xz4ljZekMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5zZTAeFw0xMDA0MTMwODExMDZaFw0y
+MDA0MTAwODExMDZaMCMxITAfBgNVBAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKb7oP0akg/pFZqs7HvD
+YH/QgeMBRF+nyF7aGwc9Fl3dqQah1VdkPP/teEr803lKrkoNcugubyO0Y9zZZuMb
+65yRcQXB0JMu3aQ+GUiSiQ5h8aQ/9D93CYrpacc7ph7VVnMctBta03dWo7zg6uTj
+DovR59k4Blmlc72cGkG24FbydYMoVo0DTAbj+EeHSB5APFx/vmz3ZTA5EBoEvGQb
+8bGby2PBPnkjW7ExcVnZbaZxR+AsjziB2lwILMd9huP7uRXo230GjqC4cAFFEfXO
+X8iCR51ekh5uNMQhDSvGhTViP+6Kkf89RaSXQ0rZgpjJymznAhZkfOuuNIWzRAqi
+udsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LWtvbW0tYWRtaW4xLml0LnN1LnNl
+MB0GA1UdDgQWBBQ58+0lsNzDRAqmUMIZRgQ0tV7IzjANBgkqhkiG9w0BAQUFAAOC
+AQEAKXaBfwubmsOke4gFS8s8M4LwFhFtxwXjN/zmLoQBvmHerCU4eT/JXm05Q6+w
+/rtF41oG8SD3Ghe/fTADARjcMnoo9gifyuofe+9GkvCBjZwSfktMGo3/0D38MfTM
+PJLds6RmW97ZOSsQMiwOZJmwF/hOxV3Wtz/EItK2vZJl9UWYF445KGPLtRkpH1uY
+MV84qSOGHth/zA9Zog4cHdal+HhqiAknQSxdXKINJIHZEQRxW0AmpzN42sHgie/N
+R12FEuHBDdtqgMbtziKhacYI87uG6/KvAHhE6bPDdmLnboviJ0/0E+CeogrT9Rju
+gWnsyGjBC5P8rFLfLiT5svPebw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-komm-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-komm-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAIL1xz4ljZekMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5zZTAeFw0xMDA0MTMwODExMDZaFw0y
+MDA0MTAwODExMDZaMCMxITAfBgNVBAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKb7oP0akg/pFZqs7HvD
+YH/QgeMBRF+nyF7aGwc9Fl3dqQah1VdkPP/teEr803lKrkoNcugubyO0Y9zZZuMb
+65yRcQXB0JMu3aQ+GUiSiQ5h8aQ/9D93CYrpacc7ph7VVnMctBta03dWo7zg6uTj
+DovR59k4Blmlc72cGkG24FbydYMoVo0DTAbj+EeHSB5APFx/vmz3ZTA5EBoEvGQb
+8bGby2PBPnkjW7ExcVnZbaZxR+AsjziB2lwILMd9huP7uRXo230GjqC4cAFFEfXO
+X8iCR51ekh5uNMQhDSvGhTViP+6Kkf89RaSXQ0rZgpjJymznAhZkfOuuNIWzRAqi
+udsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LWtvbW0tYWRtaW4xLml0LnN1LnNl
+MB0GA1UdDgQWBBQ58+0lsNzDRAqmUMIZRgQ0tV7IzjANBgkqhkiG9w0BAQUFAAOC
+AQEAKXaBfwubmsOke4gFS8s8M4LwFhFtxwXjN/zmLoQBvmHerCU4eT/JXm05Q6+w
+/rtF41oG8SD3Ghe/fTADARjcMnoo9gifyuofe+9GkvCBjZwSfktMGo3/0D38MfTM
+PJLds6RmW97ZOSsQMiwOZJmwF/hOxV3Wtz/EItK2vZJl9UWYF445KGPLtRkpH1uY
+MV84qSOGHth/zA9Zog4cHdal+HhqiAknQSxdXKINJIHZEQRxW0AmpzN42sHgie/N
+R12FEuHBDdtqgMbtziKhacYI87uG6/KvAHhE6bPDdmLnboviJ0/0E+CeogrT9Rju
+gWnsyGjBC5P8rFLfLiT5svPebw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..d1adc98f
--- /dev/null
+++ b/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-migr-admin.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-migr-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-migr-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJYnIHUJymP2MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDExMTUwODE3MzRaFw0y
+MDExMTIwODE3MzRaMCMxITAfBgNVBAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAlEtcytCR92E2EOJA9
+FDLkLbBVPVylwurcVOr/UohgM3tWKBkNZ/NMTPzsn4t9L3IJMDYz60d5jRHiU9Vr
+XhENl+BmdkMPig+RvdPMG43O2U5rdqFmtJXhJD3YOIu93w2amXeXCMgnVkx3HhA0
+PJzbUu1CN3HKPTv1jcTPRPfZ+7OaPhYrDWOyaqNW7Uqogb7zgYZxCBrKHeCRmIYp
+1afLj9xEdRFm1xnJrOnbimm4CpCOzPH7jddxWJuDPrJ2Ft5RNoiUCtIUdMcZmq2j
+UkTlwiWMuqOu6Wmqd9mLdoDsQ6/P4bysLKbQvt6SU8n8XrH+XGn9K5CqDLQVGmtO
+YgECAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LW1pZ3ItYWRtaW4xLml0LnN1LnNl
+MB0GA1UdDgQWBBQ2WkUmjqZ6M4McKqZFgmCGRguF9zANBgkqhkiG9w0BAQUFAAOC
+AQEAJ+lTSAJhbYDrNKKjhQtvD57/da4FUdYUGAndPM52jti7TB8/Y7ZP8EpczedN
+ZQTu8NJEGIeqiIPhnQoEzbZLxTMWdMxIZoovKHj37PBKkGaPwzsdzYP+f7yTH/4k
+yiGZE4J6ukF4BOtlf29msSylx/R/4B7hYsdix7rwXzvv0cafolTVmREl9knJC+vS
+1MB1E+ARGUpiYXzcjAa31mggc0cVpbvqpK0675jr0zxFBWWV6cNtmAucdyDYHwLj
+jttah1YP2ZgBKT3r0I5TX0xo/LpauRdGaH4YJmVzC48uBHtzC0sfDSVMa7pFVt7a
+8Ob/mCc6LzG3hOkXdqNDD0iuzA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-migr-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-migr-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJYnIHUJymP2MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDExMTUwODE3MzRaFw0y
+MDExMTIwODE3MzRaMCMxITAfBgNVBAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAlEtcytCR92E2EOJA9
+FDLkLbBVPVylwurcVOr/UohgM3tWKBkNZ/NMTPzsn4t9L3IJMDYz60d5jRHiU9Vr
+XhENl+BmdkMPig+RvdPMG43O2U5rdqFmtJXhJD3YOIu93w2amXeXCMgnVkx3HhA0
+PJzbUu1CN3HKPTv1jcTPRPfZ+7OaPhYrDWOyaqNW7Uqogb7zgYZxCBrKHeCRmIYp
+1afLj9xEdRFm1xnJrOnbimm4CpCOzPH7jddxWJuDPrJ2Ft5RNoiUCtIUdMcZmq2j
+UkTlwiWMuqOu6Wmqd9mLdoDsQ6/P4bysLKbQvt6SU8n8XrH+XGn9K5CqDLQVGmtO
+YgECAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LW1pZ3ItYWRtaW4xLml0LnN1LnNl
+MB0GA1UdDgQWBBQ2WkUmjqZ6M4McKqZFgmCGRguF9zANBgkqhkiG9w0BAQUFAAOC
+AQEAJ+lTSAJhbYDrNKKjhQtvD57/da4FUdYUGAndPM52jti7TB8/Y7ZP8EpczedN
+ZQTu8NJEGIeqiIPhnQoEzbZLxTMWdMxIZoovKHj37PBKkGaPwzsdzYP+f7yTH/4k
+yiGZE4J6ukF4BOtlf29msSylx/R/4B7hYsdix7rwXzvv0cafolTVmREl9knJC+vS
+1MB1E+ARGUpiYXzcjAa31mggc0cVpbvqpK0675jr0zxFBWWV6cNtmAucdyDYHwLj
+jttah1YP2ZgBKT3r0I5TX0xo/LpauRdGaH4YJmVzC48uBHtzC0sfDSVMa7pFVt7a
+8Ob/mCc6LzG3hOkXdqNDD0iuzA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..46cff006
--- /dev/null
+++ b/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-redmigr-admin.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-redmigr-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-redmigr-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAPjBkccnPmL8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG3BwOS1yZWRtaWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDAzMzAxNTA5NDda
+Fw0yMDAzMjcxNTA5NDdaMCYxJDAiBgNVBAMTG3BwOS1yZWRtaWdyLWFkbWluMS5p
+dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0tKl0WTMBq
+dyKpQZ3yQmkftM0VCDayH8qLRVdwIfJQGsb4FH1JY1bBxFo7MAYyNQdVo/ZjPWgc
+uxlnLMpWNwIKq4ppKGB+tz7zJ0DnPLjVM3DZhkedKr5aMqb+GkWouWS7NefBI0Ur
+79CMk9VSNu4LtL8gkdt9Sa6ZiMhNXY7UvAjk6zYD9m6Aq2LTd2OJNemXRdTS6BJN
+KdQS/GrUN34xdWtiJpP73FB6LEZ/Zr0COAqDYjC8trfPLjHgrBlys7Vz2NtInepM
+lutsmgsCDkZmw4E7ER+rnG8p4k+QHNYyW3wuJ+IXEiD5kCwc9DPtwmU5n43OOVm2
+v9arg0mH6AUCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZG1pZ3ItYWRtaW4x
+Lml0LnN1LnNlMB0GA1UdDgQWBBRN8FcDcUnWdavUqpTCcyShocucpjANBgkqhkiG
+9w0BAQUFAAOCAQEANeuBGDI/Seh1/8M/ZDEXKEtSzZkMH2yTjpyVsq5wT8AJyRhG
+hpVqWzjRPTOjoHsBvSxdBEIcp55PonshjsKao9Ml80f4HRO0TYOyLqcEmSjE2/ja
+7BG2MBLqkTuynDbcEaElvwq/ISIi2QV4SCjEPClSromna6RlA1SfXxnD2aP8Sy/9
+dzuDa2tLHOGU23V6aKCzU+EPmMtqxKQiF+PH8aK/zW3ZrFhlslQh02ghh3sH+3n8
+tYKKiqdfhZMEf4oZur0E33RdJGW1nXbzqN4pXXS4kAzEIZoViyEz2/dy14YNrCzX
+gJIKAMgGoZsdVnA8bUktfVlibXOxBDcIRLeEgA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-redmigr-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-redmigr-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAPjBkccnPmL8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG3BwOS1yZWRtaWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDAzMzAxNTA5NDda
+Fw0yMDAzMjcxNTA5NDdaMCYxJDAiBgNVBAMTG3BwOS1yZWRtaWdyLWFkbWluMS5p
+dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0tKl0WTMBq
+dyKpQZ3yQmkftM0VCDayH8qLRVdwIfJQGsb4FH1JY1bBxFo7MAYyNQdVo/ZjPWgc
+uxlnLMpWNwIKq4ppKGB+tz7zJ0DnPLjVM3DZhkedKr5aMqb+GkWouWS7NefBI0Ur
+79CMk9VSNu4LtL8gkdt9Sa6ZiMhNXY7UvAjk6zYD9m6Aq2LTd2OJNemXRdTS6BJN
+KdQS/GrUN34xdWtiJpP73FB6LEZ/Zr0COAqDYjC8trfPLjHgrBlys7Vz2NtInepM
+lutsmgsCDkZmw4E7ER+rnG8p4k+QHNYyW3wuJ+IXEiD5kCwc9DPtwmU5n43OOVm2
+v9arg0mH6AUCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZG1pZ3ItYWRtaW4x
+Lml0LnN1LnNlMB0GA1UdDgQWBBRN8FcDcUnWdavUqpTCcyShocucpjANBgkqhkiG
+9w0BAQUFAAOCAQEANeuBGDI/Seh1/8M/ZDEXKEtSzZkMH2yTjpyVsq5wT8AJyRhG
+hpVqWzjRPTOjoHsBvSxdBEIcp55PonshjsKao9Ml80f4HRO0TYOyLqcEmSjE2/ja
+7BG2MBLqkTuynDbcEaElvwq/ISIi2QV4SCjEPClSromna6RlA1SfXxnD2aP8Sy/9
+dzuDa2tLHOGU23V6aKCzU+EPmMtqxKQiF+PH8aK/zW3ZrFhlslQh02ghh3sH+3n8
+tYKKiqdfhZMEf4oZur0E33RdJGW1nXbzqN4pXXS4kAzEIZoViyEz2/dy14YNrCzX
+gJIKAMgGoZsdVnA8bUktfVlibXOxBDcIRLeEgA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..cccf6b89
--- /dev/null
+++ b/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-redtest-admin.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-redtest-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-redtest-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAN1GOBmzBZpNMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5pdC5zdS5zZTAeFw0xMDAyMTExNTQwMTVa
+Fw0yMDAyMDkxNTQwMTVaMCYxJDAiBgNVBAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5p
+dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6wf865wqrS
+IwIxYALKc92Wi4eJNI5IRijMOYZHgzDvoBctTgQL0TG31psv422pUhfHODZDPN3O
+7m1P6YW9G8AcPm07afwibisYNLbntxa6acuAJ4TG1nfphE3YYojP7kLuS5Xbvjcg
+lqIXnnvVm+uP0uNaRK94jwoGFZ73Ljz6lkwsTJjzn5yMQFMBCmbG784ff8PkupxO
+YF3hm74tlm8zqhCzXIcmYU1fja8nXE5HwHdOnmZ+vOlgr9AighEKCxISsMVy4CDK
+l8uZBuw8LBGA75VXPTrjbQ0ZXEQ9Fk2t0LUbGqvcsEVWwNFnYFJgArkzehPcliWS
+t/Gn4WIpu+UCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZHRlc3QtYWRtaW4x
+Lml0LnN1LnNlMB0GA1UdDgQWBBRxWsX3MhdfMIRkY57kFibMC0kN7zANBgkqhkiG
+9w0BAQUFAAOCAQEAE87UBt2539lEBTHhpaoqLHcaAwXQBnVyntRVbLY7gaLdLylq
+2Z/6vF/2DA+f3DtqaHMcAJZU2x2osERliG1Uvx5HFiVnJQ+qY+i178Qp4pSsbsPz
+vE1x+TCn61NICuLUAsrjKZGUCcgeDXK01DaP6FfdnEUfhtJQ66kIzNUQW5nHerw/
+MVJeJbX7Rt6bf8LaaIH5wcZW9JeKxXJv23kCRCMMSf4OF9grlVgwrGPknbTxnMgw
+KAeYS6PTinrbpYICMGr819vwLc0UvW7U7jylSpgfROOxIEeQlIJrDGuxBJNkwkq0
+ZM0TPzxYIudNdoRwlCMbewpIpQDmj/DTPkAsKw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pp9-redtest-admin1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pp9-redtest-admin1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAN1GOBmzBZpNMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5pdC5zdS5zZTAeFw0xMDAyMTExNTQwMTVa
+Fw0yMDAyMDkxNTQwMTVaMCYxJDAiBgNVBAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5p
+dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6wf865wqrS
+IwIxYALKc92Wi4eJNI5IRijMOYZHgzDvoBctTgQL0TG31psv422pUhfHODZDPN3O
+7m1P6YW9G8AcPm07afwibisYNLbntxa6acuAJ4TG1nfphE3YYojP7kLuS5Xbvjcg
+lqIXnnvVm+uP0uNaRK94jwoGFZ73Ljz6lkwsTJjzn5yMQFMBCmbG784ff8PkupxO
+YF3hm74tlm8zqhCzXIcmYU1fja8nXE5HwHdOnmZ+vOlgr9AighEKCxISsMVy4CDK
+l8uZBuw8LBGA75VXPTrjbQ0ZXEQ9Fk2t0LUbGqvcsEVWwNFnYFJgArkzehPcliWS
+t/Gn4WIpu+UCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZHRlc3QtYWRtaW4x
+Lml0LnN1LnNlMB0GA1UdDgQWBBRxWsX3MhdfMIRkY57kFibMC0kN7zANBgkqhkiG
+9w0BAQUFAAOCAQEAE87UBt2539lEBTHhpaoqLHcaAwXQBnVyntRVbLY7gaLdLylq
+2Z/6vF/2DA+f3DtqaHMcAJZU2x2osERliG1Uvx5HFiVnJQ+qY+i178Qp4pSsbsPz
+vE1x+TCn61NICuLUAsrjKZGUCcgeDXK01DaP6FfdnEUfhtJQ66kIzNUQW5nHerw/
+MVJeJbX7Rt6bf8LaaIH5wcZW9JeKxXJv23kCRCMMSf4OF9grlVgwrGPknbTxnMgw
+KAeYS6PTinrbpYICMGr819vwLc0UvW7U7jylSpgfROOxIEeQlIJrDGuxBJNkwkq0
+ZM0TPzxYIudNdoRwlCMbewpIpQDmj/DTPkAsKw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml b/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..ed73abca
--- /dev/null
+++ b/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt-test-app1.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rt-test-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rt-test-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAO32CkJlX+/pMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHJ0LXRlc3QtYXBwMTAeFw0xMDA3MTkxMDExNTRaFw0yMDA3MTYxMDExNTRa
+MBcxFTATBgNVBAMTDHJ0LXRlc3QtYXBwMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL130rFvSTBveOvloRg3fezPY4Phi14vff2sP9uVKijx0FKEx7DG
+RKJN6D5nZmXt4x5UzG3LetcfhjPlBu97q28RXLKDA3ICjvJwYaxtezuiYgfLogqK
+QlupoWqM9JuH0NHgkbcqjfuDrCv7dA6ONizN4rQQ//XMIx0sFw0lHgDsrBJM2tsD
+U52W0RakUuWzRxaCdq+fLpvzp3RlFrxnhGrtW6tUiXaIrJL/eyXF+MNi6XMKdo0N
+mdiEs7o4+5bsOMjT+KY1s+Dgdun2Wn9Bx9ahoV0AdNA2NUQJAmIn2w99/2Ysu4up
+NsqxE3HSrTEBjhqxYMF8LnqmC2NHDznRSTUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+cnQtdGVzdC1hcHAxMB0GA1UdDgQWBBQ6wPVxoa6YNM3Iv0a7ubYtHi4rujANBgkq
+hkiG9w0BAQUFAAOCAQEArbBt80mU0Hqg7HkeFD6Flx4feO95NvY+g2t7sUXFoVio
+kU9boN762OeaYBru7+d0aEx2iYdCuHcGXIDFMzutyqGzuRGAaPK0EqxQHZ0s5BbE
+BHTfmiFlQ8DZmsSgrHdlkYN3ZlEbtGWTE3CZDV407tuYV+/gu2JQ76K53rbpJC2C
+dYOhRYC97dn+EEhw8yHGBwdmzDXUdl7jSJUZbtXkShGgMazynH2mdaHbk4UO28Zr
+O/b1/rN0BuKDZ2rdvggEhT3YAPmEpW+qS9F06BJSJovryHCAmlvyy7pLYwscXHzd
+UNpiKN2S312lAEnoyhck4u1vFyWNvQpeW9Q0iNvykQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rt-test-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rt-test-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAO32CkJlX+/pMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHJ0LXRlc3QtYXBwMTAeFw0xMDA3MTkxMDExNTRaFw0yMDA3MTYxMDExNTRa
+MBcxFTATBgNVBAMTDHJ0LXRlc3QtYXBwMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL130rFvSTBveOvloRg3fezPY4Phi14vff2sP9uVKijx0FKEx7DG
+RKJN6D5nZmXt4x5UzG3LetcfhjPlBu97q28RXLKDA3ICjvJwYaxtezuiYgfLogqK
+QlupoWqM9JuH0NHgkbcqjfuDrCv7dA6ONizN4rQQ//XMIx0sFw0lHgDsrBJM2tsD
+U52W0RakUuWzRxaCdq+fLpvzp3RlFrxnhGrtW6tUiXaIrJL/eyXF+MNi6XMKdo0N
+mdiEs7o4+5bsOMjT+KY1s+Dgdun2Wn9Bx9ahoV0AdNA2NUQJAmIn2w99/2Ysu4up
+NsqxE3HSrTEBjhqxYMF8LnqmC2NHDznRSTUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+cnQtdGVzdC1hcHAxMB0GA1UdDgQWBBQ6wPVxoa6YNM3Iv0a7ubYtHi4rujANBgkq
+hkiG9w0BAQUFAAOCAQEArbBt80mU0Hqg7HkeFD6Flx4feO95NvY+g2t7sUXFoVio
+kU9boN762OeaYBru7+d0aEx2iYdCuHcGXIDFMzutyqGzuRGAaPK0EqxQHZ0s5BbE
+BHTfmiFlQ8DZmsSgrHdlkYN3ZlEbtGWTE3CZDV407tuYV+/gu2JQ76K53rbpJC2C
+dYOhRYC97dn+EEhw8yHGBwdmzDXUdl7jSJUZbtXkShGgMazynH2mdaHbk4UO28Zr
+O/b1/rN0BuKDZ2rdvggEhT3YAPmEpW+qS9F06BJSJovryHCAmlvyy7pLYwscXHzd
+UNpiKN2S312lAEnoyhck4u1vFyWNvQpeW9Q0iNvykQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/rt.it.su.se-shibboleth.sso.xml b/swamid-2.0/rt.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..3264276f
--- /dev/null
+++ b/swamid-2.0/rt.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rt-prod-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rt-prod-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAKBIS5cDlLWNMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHJ0LXByb2QtYXBwMTAeFw0xMDA4MzAxMTA2MDlaFw0yMDA4MjcxMTA2MDla
+MBcxFTATBgNVBAMTDHJ0LXByb2QtYXBwMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOw1y25D6e+K8IV5nk9FGd3fFOwQyMwE2ghr0PmG8/gzYB67MKKc
+qI0BmnJqU9mzeyBtFGsjWPZg4zNYPHg2Xtlr7pbjnJbs9xCDoTYmi0pogHgN0Nhj
+qQsozN2AfOCKW/+5nm7ie1sz8ulvpITxvQ0/W1m/MQu/Fp9T2MTQpgz7GajNK6iX
+rvNgjAnzcN1alxuymf6lGS0AIXAhl1s3WIE72+z62zyldkXEnXWwUQLZ+k+1ktFe
+4LJXMSkQIWeWo3U/88lzPQni3LzmwZvNfX0sxurYWQUpb3NMHoAFLC84NUkNu9Fw
+7mFeETi2XT/h5wPRv7KbJR2/ejJTQIiDug8CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+cnQtcHJvZC1hcHAxMB0GA1UdDgQWBBQDQ3vqAmqYxZvUyCxxNQvRmduSszANBgkq
+hkiG9w0BAQUFAAOCAQEAKa4ueISKf1UxEnkxwBJ29DR9VQs2oObK/RAhwE+1Bcms
+tmg5aaEl79gqe6ON9Ht8H07e7g1S88bA+Toh2PgrgJgdNV+ZAfSA77D+FomLUGqi
+jmNDciIrVlX/74Z478cvtlMRH8VAoR8Zb+DcmT1s0ITOZdbVM/CIel/ElJXVGaBc
+wAvF+AGinxmeyTAyeibz2WeQaXJ4/OKx46CKS97cySuSisa+mjHZIhmox4AMemLI
+17pBJtxaN20kcp+s+JpHUl+BxppC5FzgkNgpLiQJsE3NrNKwWy9T+eEunHg/P+QV
+XEbH/MuUpwOLZWoRdNDdDwDbkWVjlDLsoUBphLqLfw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rt-prod-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rt-prod-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAKBIS5cDlLWNMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHJ0LXByb2QtYXBwMTAeFw0xMDA4MzAxMTA2MDlaFw0yMDA4MjcxMTA2MDla
+MBcxFTATBgNVBAMTDHJ0LXByb2QtYXBwMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOw1y25D6e+K8IV5nk9FGd3fFOwQyMwE2ghr0PmG8/gzYB67MKKc
+qI0BmnJqU9mzeyBtFGsjWPZg4zNYPHg2Xtlr7pbjnJbs9xCDoTYmi0pogHgN0Nhj
+qQsozN2AfOCKW/+5nm7ie1sz8ulvpITxvQ0/W1m/MQu/Fp9T2MTQpgz7GajNK6iX
+rvNgjAnzcN1alxuymf6lGS0AIXAhl1s3WIE72+z62zyldkXEnXWwUQLZ+k+1ktFe
+4LJXMSkQIWeWo3U/88lzPQni3LzmwZvNfX0sxurYWQUpb3NMHoAFLC84NUkNu9Fw
+7mFeETi2XT/h5wPRv7KbJR2/ejJTQIiDug8CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+cnQtcHJvZC1hcHAxMB0GA1UdDgQWBBQDQ3vqAmqYxZvUyCxxNQvRmduSszANBgkq
+hkiG9w0BAQUFAAOCAQEAKa4ueISKf1UxEnkxwBJ29DR9VQs2oObK/RAhwE+1Bcms
+tmg5aaEl79gqe6ON9Ht8H07e7g1S88bA+Toh2PgrgJgdNV+ZAfSA77D+FomLUGqi
+jmNDciIrVlX/74Z478cvtlMRH8VAoR8Zb+DcmT1s0ITOZdbVM/CIel/ElJXVGaBc
+wAvF+AGinxmeyTAyeibz2WeQaXJ4/OKx46CKS97cySuSisa+mjHZIhmox4AMemLI
+17pBJtxaN20kcp+s+JpHUl+BxppC5FzgkNgpLiQJsE3NrNKwWy9T+eEunHg/P+QV
+XEbH/MuUpwOLZWoRdNDdDwDbkWVjlDLsoUBphLqLfw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rt.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rt.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rt.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rt.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..836e749b
--- /dev/null
+++ b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?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://shibboleth.net.lu.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="78" width="382">http://www.lu.se/profiles/lu/themes/lu_theme/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="90" width="450">http://www2.ldc.lu.se/images/LU_eng_logo.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>lu.se</mdui:DomainHint>
+        <mdui:DomainHint>lth.se</mdui:DomainHint>
+        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUHLaZATm8vxcp1L4T0A9woLa1naIwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5uZXQubHUuc2UwHhcNMDkwOTMwMTE0
+ODIyWhcNMjkwOTMwMTE0ODIyWjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLm5ldC5s
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI+ayJjc9XUuSABN
+M0X1KTfxv2arrhq8BV59iG1I9x3+Ga8lU0HH6zNNhT+ezRzxpSzeaTZZ+RcMAJS5
+e6whhw4R92Ei25CNYQKalUwfGRP3X3shGttUXG2wdZ+5ruSje7LVBE7bS2Ek05TJ
+fnMc3O+hc5XwbpXBii2KqosrIS7kiR5FuUPOrMWE4Sr1zoE8TFhOOv8zf9AOLE++
+k6aqas7TW9KCT7W8eyHNbcevEW8VhHpM49OGyzsjuJ8X6KkKNm1rSJgLEnnBy5y+
+LuiM4Ad5LjAgcdetxGm5VgpOx8h5prX5H0R0+C8A9Pm50VuNuv9h9iLI0z42Qemm
+3A5vgrUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5uZXQubHUuc2WG
+K2h0dHBzOi8vc2hpYmJvbGV0aC5uZXQubHUuc2UvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFBlhR15/bdMDrBj/juMKUCB6K8TvMA0GCSqGSIb3DQEBBQUAA4IBAQBG
+XWHuslQiZD9yHWuQnMTYiB2cfp+82TNf0CIpoKzNPpcbUg4bX9NF8tyuCMAh6Tvf
+fNrkx++wXnbzjPmNKaryJDQGokz86pZdGRsNTt4dDDJSKCuSWP+kwCHf68/eklc1
+zB0hU4yYhR6vyoNz/UKA/jh6WyNPP6hoeq9XZinU+iMVIdRF5CPHM/tpbcdk6elP
+tJPbWzQInOy+wWmZvFnbN1qwvnlFkYNdH+R0QM2Pvkz7DUG2FqvsbtrKZvj/IHHh
+zlPsVj43MhXLVfk/EtgL8BmxjOW08uY3EDXl3hFwJB/XRURouZC3euoBgE41FMKb
+ADE1bHKRi4qX9DYfBN7g
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.net.lu.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://shibboleth.net.lu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net.lu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net.lu.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUHLaZATm8vxcp1L4T0A9woLa1naIwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5uZXQubHUuc2UwHhcNMDkwOTMwMTE0
+ODIyWhcNMjkwOTMwMTE0ODIyWjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLm5ldC5s
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI+ayJjc9XUuSABN
+M0X1KTfxv2arrhq8BV59iG1I9x3+Ga8lU0HH6zNNhT+ezRzxpSzeaTZZ+RcMAJS5
+e6whhw4R92Ei25CNYQKalUwfGRP3X3shGttUXG2wdZ+5ruSje7LVBE7bS2Ek05TJ
+fnMc3O+hc5XwbpXBii2KqosrIS7kiR5FuUPOrMWE4Sr1zoE8TFhOOv8zf9AOLE++
+k6aqas7TW9KCT7W8eyHNbcevEW8VhHpM49OGyzsjuJ8X6KkKNm1rSJgLEnnBy5y+
+LuiM4Ad5LjAgcdetxGm5VgpOx8h5prX5H0R0+C8A9Pm50VuNuv9h9iLI0z42Qemm
+3A5vgrUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5uZXQubHUuc2WG
+K2h0dHBzOi8vc2hpYmJvbGV0aC5uZXQubHUuc2UvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFBlhR15/bdMDrBj/juMKUCB6K8TvMA0GCSqGSIb3DQEBBQUAA4IBAQBG
+XWHuslQiZD9yHWuQnMTYiB2cfp+82TNf0CIpoKzNPpcbUg4bX9NF8tyuCMAh6Tvf
+fNrkx++wXnbzjPmNKaryJDQGokz86pZdGRsNTt4dDDJSKCuSWP+kwCHf68/eklc1
+zB0hU4yYhR6vyoNz/UKA/jh6WyNPP6hoeq9XZinU+iMVIdRF5CPHM/tpbcdk6elP
+tJPbWzQInOy+wWmZvFnbN1qwvnlFkYNdH+R0QM2Pvkz7DUG2FqvsbtrKZvj/IHHh
+zlPsVj43MhXLVfk/EtgL8BmxjOW08uY3EDXl3hFwJB/XRURouZC3euoBgE41FMKb
+ADE1bHKRi4qX9DYfBN7g
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.net.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.net.lu.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">LU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.lu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Lund University</Company>
+    <SurName>Eskil Swahn</SurName>
+    <EmailAddress>Eskil.Swahn@LDC.lu.se</EmailAddress>
+    <TelephoneNumber>+46 46 222 1323</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Lund University</Company>
+    <SurName>Johan Silverup</SurName>
+    <EmailAddress>Johan.Silverup@LDC.lu.se</EmailAddress>
+    <TelephoneNumber>+46 46 222 6313</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Lund University</Company>
+    <SurName>LU Support</SurName>
+    <EmailAddress>support@lu.se</EmailAddress>
+    <TelephoneNumber>+46 46 222 9000</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..660e76dc
--- /dev/null
+++ b/swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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://shibboleth.slu.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
+        <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAJgPjWyV8mnw8Zm9lp8a5mHvQve+MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGguc2x1LnNlMB4XDTEwMDMxNjExNDAy
+MVoXDTMwMDMxNjExNDAyMVowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zbHUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvQU5k1AvEYedH5FYRuklo
+9wfvfTc5yHnA2NE7mFmnLqYyNhacWsb5kl53TCvHhCUh1RmTwPxDtOgAi1YmyF1X
+On/U3SPOOm3FVqDbmGOZIiYD2+R2LhvifGXvVXNvE0rJR4aK02C4cmVaxJCSpVfI
++dGBECEVvzaFy3zQEZmOyeiClFaDKlwLEBj1qWSUWWhMeryYLbNUHiR+5NznHqeB
+RfFPExXbTfjSgUXiq3c7w80AUUC8zAjxo8oQCRoCvmvhT38McCUustziUPzc6/UC
+M2h+eET25OoCCkC5/VPyfTWHfzTOTDasMvny3Jp5fASZ0JxPKAVtU+7arPBf1FmN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGguc2x1LnNlhihodHRwczov
+L3NoaWJib2xldGguc2x1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTDGADa
+Hy53hIGPonu2OOONEh54YDANBgkqhkiG9w0BAQUFAAOCAQEAiDlmcUcHOV/GYog4
+UlB4NsZfcfARpmNeR16jmbfXBX5gmwKAlltqUZhhKB89qPCOv/cKjlBXga3Ypdqd
+nZa7NobQlyVsJgBUB82Nh8RRsGB0jaHpAXC48ey5sKqcpVQnCcKG51svYkQHmNRD
++jza1oyX/wZLjk4whkJm0ef7vToN8xd/cYc0EyfqN7VSDXMdVUtzJDd298CGNx6Q
+Xr7EfTMM2MhwKghEOOn25472fguv+kLwaEpOWKKR5vzYPcH5kpYC29CeHCnnHrJv
+sAvj1/KeSjxuQ71kHH8n7cxIqUc+MeHZXAANL9fqDkfeT4L6RStHNUpNCVS9se5b
+xpmbgA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.slu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.slu.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAJgPjWyV8mnw8Zm9lp8a5mHvQve+MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGguc2x1LnNlMB4XDTEwMDMxNjExNDAy
+MVoXDTMwMDMxNjExNDAyMVowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zbHUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvQU5k1AvEYedH5FYRuklo
+9wfvfTc5yHnA2NE7mFmnLqYyNhacWsb5kl53TCvHhCUh1RmTwPxDtOgAi1YmyF1X
+On/U3SPOOm3FVqDbmGOZIiYD2+R2LhvifGXvVXNvE0rJR4aK02C4cmVaxJCSpVfI
++dGBECEVvzaFy3zQEZmOyeiClFaDKlwLEBj1qWSUWWhMeryYLbNUHiR+5NznHqeB
+RfFPExXbTfjSgUXiq3c7w80AUUC8zAjxo8oQCRoCvmvhT38McCUustziUPzc6/UC
+M2h+eET25OoCCkC5/VPyfTWHfzTOTDasMvny3Jp5fASZ0JxPKAVtU+7arPBf1FmN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGguc2x1LnNlhihodHRwczov
+L3NoaWJib2xldGguc2x1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTDGADa
+Hy53hIGPonu2OOONEh54YDANBgkqhkiG9w0BAQUFAAOCAQEAiDlmcUcHOV/GYog4
+UlB4NsZfcfARpmNeR16jmbfXBX5gmwKAlltqUZhhKB89qPCOv/cKjlBXga3Ypdqd
+nZa7NobQlyVsJgBUB82Nh8RRsGB0jaHpAXC48ey5sKqcpVQnCcKG51svYkQHmNRD
++jza1oyX/wZLjk4whkJm0ef7vToN8xd/cYc0EyfqN7VSDXMdVUtzJDd298CGNx6Q
+Xr7EfTMM2MhwKghEOOn25472fguv+kLwaEpOWKKR5vzYPcH5kpYC29CeHCnnHrJv
+sAvj1/KeSjxuQ71kHH8n7cxIqUc+MeHZXAANL9fqDkfeT4L6RStHNUpNCVS9se5b
+xpmbgA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (gamla inloggningen)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (old)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Norrsken</SurName>
+    <EmailAddress>martin.norrsken@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Stefan</GivenName>
+    <SurName>Edholm</SurName>
+    <EmailAddress>stefan.edholm@slu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml
new file mode 100644
index 00000000..ded571fb
--- /dev/null
+++ b/swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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://shibboleth.vhs.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Verket för Högskoleservice</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Verket för Högskoleservice</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för gamla VHS som sedan 2013-01-01 ingår i Universitets- och högskolerådet (UHR)</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider för gamla VHS som sedan 2013-01-01 ingår i Universitets- och högskolerådet (UHR)</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEhDCCA2ygAwIBAgIQIH68C7SNwFgAqk5SKo9fETANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMDcwODAwMDAwMFoXDTE0MDcwNzIzNTk1OVowXjELMAkGA1UE
+BhMCU0UxJTAjBgNVBAoMHFZlcmtldCBmw7ZyIEjDtmdza29sZXNlcnZpY2UxDDAK
+BgNVBAsTA0lUUzEaMBgGA1UEAxMRc2hpYmJvbGV0aC52aHMuc2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXc4oK5t9SmlJsFQq0xW3VYUDupYUKh59g
+ObRP6bJalVZpsiZC1hiv80XfEIPhYibQy6tb1e2v6kWfwmLDQbvG46FmJMIMp1C4
+hTXeMg3q0FlsjefDCe5u1InRRAn+//smlDwcN5i49leat9TtfixO17blSrwZGUr0
+4fJ7ksvA+3MThpnj7v0dOHoBQ1tpm3B1GzuRR5fRcAFFQ7HvWUBUIy3LMJEwbvhu
+2JtPY6juwADYFwXIRxoQoLJmzxl8CdacfrHjOUXegZBWNBT48sZNx/Mx+6ntLBlk
+6yPb875cNs3rb2b29qK5fhSnC2GldcZISPbBmRY8Geg95vKdklVJAgMBAAGjggFk
+MIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+Z+OYS2QD6EfmfNxdl553Ch3oVQ4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUw
+E4IRc2hpYmJvbGV0aC52aHMuc2UwDQYJKoZIhvcNAQEFBQADggEBAEGqWH7Wh8Bw
+nm4D9PI+gcuhQ/PNnm1WZ5mZStzguHIpNb0a+862pvyvuFGras7y3azbggJaHY78
+E9ne60MQTKDKr0K7pSyMqGobaxsp/w3enDIX7Iz07v6aEVz909YdLuGsWZXVPKws
+0Dsp+a4EwRtWQuK5yUZ4ix6l5NwBWh6e/xQ7jzhTrVj9ONjpjUu26YHzJboPiIu8
+POezRx+sHkS7TRJI9XkD1kgphz3QF9u8GfCvteDbl9v2TCZaKR8q1J4wd9QD2Ki1
+pywz/Z6FlltyOVqgUp57YwM82wj0LPqoGnW6Pt3x+kKCRs5j2cvQpg1z9wvu8WFI
+jztUvasgi2c=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.vhs.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://shibboleth.vhs.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.vhs.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.vhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.vhs.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">
+    <Extensions>
+      <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEhDCCA2ygAwIBAgIQIH68C7SNwFgAqk5SKo9fETANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMDcwODAwMDAwMFoXDTE0MDcwNzIzNTk1OVowXjELMAkGA1UE
+BhMCU0UxJTAjBgNVBAoMHFZlcmtldCBmw7ZyIEjDtmdza29sZXNlcnZpY2UxDDAK
+BgNVBAsTA0lUUzEaMBgGA1UEAxMRc2hpYmJvbGV0aC52aHMuc2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXc4oK5t9SmlJsFQq0xW3VYUDupYUKh59g
+ObRP6bJalVZpsiZC1hiv80XfEIPhYibQy6tb1e2v6kWfwmLDQbvG46FmJMIMp1C4
+hTXeMg3q0FlsjefDCe5u1InRRAn+//smlDwcN5i49leat9TtfixO17blSrwZGUr0
+4fJ7ksvA+3MThpnj7v0dOHoBQ1tpm3B1GzuRR5fRcAFFQ7HvWUBUIy3LMJEwbvhu
+2JtPY6juwADYFwXIRxoQoLJmzxl8CdacfrHjOUXegZBWNBT48sZNx/Mx+6ntLBlk
+6yPb875cNs3rb2b29qK5fhSnC2GldcZISPbBmRY8Geg95vKdklVJAgMBAAGjggFk
+MIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+Z+OYS2QD6EfmfNxdl553Ch3oVQ4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUw
+E4IRc2hpYmJvbGV0aC52aHMuc2UwDQYJKoZIhvcNAQEFBQADggEBAEGqWH7Wh8Bw
+nm4D9PI+gcuhQ/PNnm1WZ5mZStzguHIpNb0a+862pvyvuFGras7y3azbggJaHY78
+E9ne60MQTKDKr0K7pSyMqGobaxsp/w3enDIX7Iz07v6aEVz909YdLuGsWZXVPKws
+0Dsp+a4EwRtWQuK5yUZ4ix6l5NwBWh6e/xQ7jzhTrVj9ONjpjUu26YHzJboPiIu8
+POezRx+sHkS7TRJI9XkD1kgphz3QF9u8GfCvteDbl9v2TCZaKR8q1J4wd9QD2Ki1
+pywz/Z6FlltyOVqgUp57YwM82wj0LPqoGnW6Pt3x+kKCRs5j2cvQpg1z9wvu8WFI
+jztUvasgi2c=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.vhs.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">VHS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Verket för Högskoleservice</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Verket för Högskoleservice</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.vhs.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>VHS</Company>
+    <EmailAddress>bjorn.soderstedt@vhs.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..f067f0d1
--- /dev/null
+++ b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.wavelan.su.se/Shibboleth.sso">
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
+MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
+x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
+pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
+Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
+oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
+P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
+8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
+LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
+AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
+B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
+oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
+mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
+xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
+m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
+MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
+x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
+pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
+Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
+oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
+P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
+8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
+LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
+AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
+B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
+oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
+mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
+xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
+m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test.mp.uu.se-shibboleth.sso.xml b/swamid-2.0/test.mp.uu.se-shibboleth.sso.xml
new file mode 100644
index 00000000..b76a1bce
--- /dev/null
+++ b/swamid-2.0/test.mp.uu.se-shibboleth.sso.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://test.mp.uu.se/Shibboleth.sso">
+  <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Test medarbetarportalen Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Test Medarbetarportalen Uppsala universitet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Tjänsten Medarbetarportalen är en portal för anställda vid Uppsala universitet och används som ett "paraply" för andra tjänster vid universitetet samt för publicering av information som rör anställda.</mdui:Description>
+        <mdui:Description xml:lang="en">Medarbetarportalen is a portal for all employees at Uppsala University and is used as an ‘umbrella’ for other services at the university, as well as for pieces of information relevant to all employees.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC7jCCAdagAwIBAgIJAIl80G+yw8TEMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXRlc3QubXAudXUuc2UwHhcNMTIxMDExMTQzMjU5WhcNMjIxMDA5MTQzMjU5
+WjAYMRYwFAYDVQQDEw10ZXN0Lm1wLnV1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAwqaqXqq9CgNf5q0dxBc26da3IDJgGqkDDLfguvwBEGzNl+GZ
+RFqt0zYvgm2xESBbUHYtghGhfei7o75e73wax8gNVl92BZ8pwWuzNDobGgeh4Au/
+CBm0WuZS4C9c+H7tEnaY+gajQIrIsMnVmNUg6SYw8WRVaMJ1DFJXVdVPv84hFGQl
+hhJ3JhMVSTr5XonzlEfOERC50MmJpdFWsw18ZZYguYxAO3sr8/bNWCil/UoyGlqd
+suBvl/0TBy999sppMJi9Ruf1EYZJEMp+cwktiJ0amHNM/p9Bh3UiHTmy4ezy7iOZ
+nbsZPE0kDZBy73tImrQo+gV8MXEtZMB7oLbE4QIDAQABozswOTAYBgNVHREEETAP
+gg10ZXN0Lm1wLnV1LnNlMB0GA1UdDgQWBBQ7Ui+hkYbochetApl5wxE3yuiYvjAN
+BgkqhkiG9w0BAQUFAAOCAQEAwkO8JPsnUzHZdMYJ8hARdTtucqNs7KAxHVKzrff/
+sV6M4aaXx2ZKQJnN2OKrH/VEeuia4znvgHavnLdTPt7rXiyOpBR3eLwrc8rBNEyt
+O1jddcOwjv+rihqX5h8ab1OZ2QE7ZIZO0fi2maJjOsdzJvr9CwkTpKJjHT7WCTQV
+zfAidxqveMFn/7UsoXIsiVTgQ7eEVJPl3njBDDi/E0PDmQCNMG6Trzpof9iKHAuJ
+f91arR1JmuNzmHFNaLikuWCqw/8qr938FM2uP4W2OTcMm998DSp5z+SDOHphuhZF
+6OzPcq8bOQu+OlGG4/PkOBSezPss+Vn4cuY0pAQ8VTeGSA==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml
new file mode 100644
index 00000000..40fbb8f7
--- /dev/null
+++ b/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-olho0001.ad.umu.se/shibboleth">
+  <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" 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://umdac-olho0001.ad.umu.se/Shibboleth.sso/SU"/>
+      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/KI"/>
+      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/Loginy"/>
+      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/Loginx"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>umdac-olho0001.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=olov.hoglund@adm.umu.se,CN=umdac-olho0001.ad.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAK3Ixi4wEKOLMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEhMB8GA1UEAwwYdW1kYWMtb2xobzAw
+MDEuYWQudW11LnNlMSYwJAYJKoZIhvcNAQkBFhdvbG92LmhvZ2x1bmRAYWRtLnVt
+dS5zZTAeFw0xMTA1MTkwODQzMTNaFw0xNDA0MDEwODQzMTNaMIGaMQswCQYDVQQG
+EwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQwwCgYD
+VQQKDANJVFMxDDAKBgNVBAsMA0lUUzEhMB8GA1UEAwwYdW1kYWMtb2xobzAwMDEu
+YWQudW11LnNlMSYwJAYJKoZIhvcNAQkBFhdvbG92LmhvZ2x1bmRAYWRtLnVtdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/WaqpHa41juTzDaZs4
+3FZXOXqSTtZWoI2h4/1xr619liNbZ2eJ+Dlwpjde0hyqiQ+xbMxVvMbn/6LF5Zsp
+JoNofugOMUXieKj/OiP8S35QjuOQaNIUIW102NoRsx1pqdQUYjaqg4UG/c5gyZRu
+iDff6F6lnSsnKUpWkDHDcLdknQ0pTdNlhmlR2YSoy8D2twr/SdQfih0IVbL6WLw9
+bB7T05+jxEuiAsAeDFPGnT8hHowQgHlMmRGjQ/cRRBbuMFxxfH8rB5PHe63TBxMl
+sGzQgGgqqbxn/lRiVGUcFSDbPrO5G4ndkKrz5bwwDoqCE8tJkfbEwmzfvlb6Lvcz
+BMMCAwEAAaNQME4wHQYDVR0OBBYEFLXDc99280S72ej+9ADMJPXy/HkqMB8GA1Ud
+IwQYMBaAFLXDc99280S72ej+9ADMJPXy/HkqMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADggEBALFQR+c3B/yoY0RSvcGW3GV4clryvVjDQehTsg8BrnSafuU3
+v86B38Gqrf75rm8Zrs/cm/rpcmibdTDi7EObUUrHMlRBFaaoSxwqDRNGlYhVLx6t
+iEm749FD8yau5/85er7//3a+LFEsaid4G/3jCjyVO2bmZPERrqlk2QaHhpJwmVnL
+QiOVXEI5kZcLh82asMMKOOWkm/mEaguFOXWksUSOmk1bOUxZPkY0eTtIdqyHPuBv
+3BjkPojMH6Ixwv0vluO26w1ZwOYqw6plU5n7D1tJ9YdJ6DAQjeDUXmdrgqS8Dpw9
+yJ87d7WXKCfNlolR2zh8rlXP5N2pv2MV8UsBuPY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/urn-ibistic-prod-services.ibistic.net.xml.c b/swamid-2.0/urn-ibistic-prod-services.ibistic.net.xml.c
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/swamid-2.0/urn-ibistic-prod-services.ibistic.net.xml.c
diff --git a/swamid-2.0/www.play.umu.se-shibboleth.xml b/swamid-2.0/www.play.umu.se-shibboleth.xml
new file mode 100644
index 00000000..c05044d6
--- /dev/null
+++ b/swamid-2.0/www.play.umu.se-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.play.umu.se/shibboleth">
+  <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/nren-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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.play.umu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>play.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJkObDfCTqSCMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3BsYXkudW11LnNlMB4XDTEyMDUyODEwMjg0MloXDTIyMDUyNjEwMjg0Mlow
+FjEUMBIGA1UEAxMLcGxheS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC7JIywtAOlvlPI2Fhxu5lJu6tJmBdcm1qkpm4W7kKgOPmhvDiF0RnE
+RISt6pkFMV4vqGwvfQ37yqzIUBNxX82F2ok8mhLmKGOxgWcdQ6R37XdTTQfGVPM+
+prK6TA+0oGjvsVc3H7ytoKr9wS2n/tVcMhiTJtWVA9EGpHGg2F3u4cOUmTsBdOMp
+iDzmr7OwZTv0XyeSCGojzeDo/PqaEZsNDsG1cJlaRdQ7qgi8iRhP1i94Tw7kDmco
++xGSpNZFwLZT0W+yi4q/GiZrbFeycvehAPzkVydpb6fYpZ1wsFXYGtFsKjhd20Rl
+QQ5hFpaBWAtYXNK8mCJ26Yw1esVVQjk/AgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
+YXkudW11LnNlhgtwbGF5LnVtdS5zZTAdBgNVHQ4EFgQU3R3jvWuDOcpZFkp741nw
+GIQsgP8wDQYJKoZIhvcNAQEFBQADggEBAJy9pCZjMdUeqFf1PykaPS3/x2AIaGDg
+WHelY4dEFNGB/cIX38h73CHOzk/l7SQwKdETPUlTZOuUED7RknS1QHwCesnUhHyZ
+zBSil0Qk/hCBtejPORHaWKsXTiN2iGeR2Kqh0y08S29In2MEZY+1lJRPwKAdBjAD
+UfW4qed2mTCkrDJGRxKfEj7OTUp8+Zjk+8mhlie6KdWN6O3LL7KGIDmefjhuvaSN
+RsZgWmKx9/MHsLkU1opdR9QJs8/mRpsMNoiFdBcoPv44OMuwEqJvSynge6GMOfNw
+LfULDFRxeDlyaxgD0s66OCLxachVt6b18FLPbnHRJxLYzFpZyoLLPKg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>play.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJkObDfCTqSCMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3BsYXkudW11LnNlMB4XDTEyMDUyODEwMjg0MloXDTIyMDUyNjEwMjg0Mlow
+FjEUMBIGA1UEAxMLcGxheS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC7JIywtAOlvlPI2Fhxu5lJu6tJmBdcm1qkpm4W7kKgOPmhvDiF0RnE
+RISt6pkFMV4vqGwvfQ37yqzIUBNxX82F2ok8mhLmKGOxgWcdQ6R37XdTTQfGVPM+
+prK6TA+0oGjvsVc3H7ytoKr9wS2n/tVcMhiTJtWVA9EGpHGg2F3u4cOUmTsBdOMp
+iDzmr7OwZTv0XyeSCGojzeDo/PqaEZsNDsG1cJlaRdQ7qgi8iRhP1i94Tw7kDmco
++xGSpNZFwLZT0W+yi4q/GiZrbFeycvehAPzkVydpb6fYpZ1wsFXYGtFsKjhd20Rl
+QQ5hFpaBWAtYXNK8mCJ26Yw1esVVQjk/AgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
+YXkudW11LnNlhgtwbGF5LnVtdS5zZTAdBgNVHQ4EFgQU3R3jvWuDOcpZFkp741nw
+GIQsgP8wDQYJKoZIhvcNAQEFBQADggEBAJy9pCZjMdUeqFf1PykaPS3/x2AIaGDg
+WHelY4dEFNGB/cIX38h73CHOzk/l7SQwKdETPUlTZOuUED7RknS1QHwCesnUhHyZ
+zBSil0Qk/hCBtejPORHaWKsXTiN2iGeR2Kqh0y08S29In2MEZY+1lJRPwKAdBjAD
+UfW4qed2mTCkrDJGRxKfEj7OTUp8+Zjk+8mhlie6KdWN6O3LL7KGIDmefjhuvaSN
+RsZgWmKx9/MHsLkU1opdR9QJs8/mRpsMNoiFdBcoPv44OMuwEqJvSynge6GMOfNw
+LfULDFRxeDlyaxgD0s66OCLxachVt6b18FLPbnHRJxLYzFpZyoLLPKg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.play.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.play.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.play.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.play.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.play.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.play.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.play.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.play.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.play.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.play.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.play.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2016-02-15 13:22:41 +0100
committer	Leif Johansson <leifj@sunet.se>	2016-02-15 13:22:41 +0100
commit	8a4b229d0ca09bceca6dcf65b64a72d0c0aab744 (patch)
tree	500af9eb4c22e0eed674f178c19ace544ff8e36d /swamid-2.0
parent	cb1cfc791660d27a369c7c21435792231c0b9a53 (diff)