resolves SWAMIDOPS-6187

author: Leif Johansson <leifj@sunet.se> 2011-03-04 08:43:48 +0100
committer: Leif Johansson <leifj@sunet.se> 2011-03-04 08:43:48 +0100
commit: 9c7295c7c0536e23747c4be75fd7058a764334bc (patch)
tree: 19f7479526f4027d88c95a14958fdc8d5af10555
parent: c7c437e8629e4d998bddff4431373be04dca65f2 (diff)
41 files changed, 2780 insertions, 0 deletions
diff --git a/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..1f2fa8e4
--- /dev/null
+++ b/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-21.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALFcf2KAIUufMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMwWhcNMjEwMjI3
+MTYyODMwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1osBQ5UOG8GjJ+t9831MgbYGz50akhQ
+LMAJp7vWbeUiCyjRUq7zvoiKoDUoyspldEVbpXzOq7v3sxXwa9voL6lB4qivDj9+
+szpGYxfwrgtAoBvGW+GUdaIii8yAZmQ2F9/va2gtrR7h9p4Y3yRm/bSw8QYL3C68
+8fWtvXyRLM7eu8qySyjTPhMadB6kXaT7mP/d6dx3IWtIauNonvRDrSSL6hhCmLBq
+6CnAdO0MpEcgZVJ2MFMfkNFtgQDyyHUqPllxuj/E8+KEQnn91BGdI2CJFbcDkXwz
+ueJwXe4mWDbecm3Bn9D8WVRSDlyKLrV4Jp9ksLxm2u+6tjJBFJA41wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpdJrKn8Uzwlzhd5UrE2tQ
+PlJp1jANBgkqhkiG9w0BAQUFAAOCAQEAl3F8McTRgjdUs6GqXbFYZK/D0TTbqR0w
+qyWlZe+YjVp6nK0R97faNsjOwPGmOTYKiHDx43L8Um+zkQQfa9F60/l+JuNICNOO
+bgn7WtME9DLBbHLilHXGjPOZKPPPZSkFv6mFp5s6Na5qHjXRrR09N9LnvnF99XTQ
+WZgjiEhbYNDfbcP4eKmTqWh28XuMfSPL+j3XoKq2NQIW+UOiJevOKsGFSXGDHxJZ
+NpaHOS6Ks2FyvKSUELdMOCkYkNovZPVMXSHUVpNLxeDFCSAe3bqESli2M0XwdV00
+ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
+</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>https://nya-21.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALFcf2KAIUufMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMwWhcNMjEwMjI3
+MTYyODMwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1osBQ5UOG8GjJ+t9831MgbYGz50akhQ
+LMAJp7vWbeUiCyjRUq7zvoiKoDUoyspldEVbpXzOq7v3sxXwa9voL6lB4qivDj9+
+szpGYxfwrgtAoBvGW+GUdaIii8yAZmQ2F9/va2gtrR7h9p4Y3yRm/bSw8QYL3C68
+8fWtvXyRLM7eu8qySyjTPhMadB6kXaT7mP/d6dx3IWtIauNonvRDrSSL6hhCmLBq
+6CnAdO0MpEcgZVJ2MFMfkNFtgQDyyHUqPllxuj/E8+KEQnn91BGdI2CJFbcDkXwz
+ueJwXe4mWDbecm3Bn9D8WVRSDlyKLrV4Jp9ksLxm2u+6tjJBFJA41wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpdJrKn8Uzwlzhd5UrE2tQ
+PlJp1jANBgkqhkiG9w0BAQUFAAOCAQEAl3F8McTRgjdUs6GqXbFYZK/D0TTbqR0w
+qyWlZe+YjVp6nK0R97faNsjOwPGmOTYKiHDx43L8Um+zkQQfa9F60/l+JuNICNOO
+bgn7WtME9DLBbHLilHXGjPOZKPPPZSkFv6mFp5s6Na5qHjXRrR09N9LnvnF99XTQ
+WZgjiEhbYNDfbcP4eKmTqWh28XuMfSPL+j3XoKq2NQIW+UOiJevOKsGFSXGDHxJZ
+NpaHOS6Ks2FyvKSUELdMOCkYkNovZPVMXSHUVpNLxeDFCSAe3bqESli2M0XwdV00
+ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..e7829279
--- /dev/null
+++ b/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-21.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKDHezlRTa+MfK7ybE696Nf+vcwkUrkqOYjQNgSaTXb2AXEVZLO90IseTxZMOlxIqeCF9PuCP4W28Vk5RV/nG70CAwEAAaN/MH0wHQYDVR0OBBYEFJOfd1iwTcRnrcJxsGdlZNOmpAmuME4GA1UdIwRHMEWAFJOfd1iwTcRnrcJxsGdlZNOmpAmuoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkAk1HshxAoz5cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHxqpP/AqUt3ZIn4mT1/Rk1et+bek/k6hLbqosmdw05zXg+qWWy0VMvbxFkPfda+a+KYxU4R4bZTGb8LLplydZY=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/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://nya-21.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKDHezlRTa+MfK7ybE696Nf+vcwkUrkqOYjQNgSaTXb2AXEVZLO90IseTxZMOlxIqeCF9PuCP4W28Vk5RV/nG70CAwEAAaN/MH0wHQYDVR0OBBYEFJOfd1iwTcRnrcJxsGdlZNOmpAmuME4GA1UdIwRHMEWAFJOfd1iwTcRnrcJxsGdlZNOmpAmuoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkAk1HshxAoz5cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHxqpP/AqUt3ZIn4mT1/Rk1et+bek/k6hLbqosmdw05zXg+qWWy0VMvbxFkPfda+a+KYxU4R4bZTGb8LLplydZY=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/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-1.0/nya-21.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..7f22d019
--- /dev/null
+++ b/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-21.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJg26jet2Q3XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMxWhcNMjEwMjI3
+MTYyODMxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0un7EXE+8dkUQ79q7iTAd5+Pmbh/Xr95
+Y/n6KQX833Td8UvGIIGOI9TASztBeC5+FA/7Niy8n5lXdA41u4PVnsAqkhqooyyG
+nM1RfCVUNnk3EW2+tCymUtp30LnKUSydPkvC2toeHZEb/o7kzq+Egcf+c80z+HjC
+Ut4mNqhuRv1sriX1PkbBnZwkL04/y+Wh9eXoCbVw0dJH6D7GazD3lwEaB7bPsy5c
+jtZSX89jFu8OrMI7B6pwvM/r2KYz0YT/75cSaM7UJwlb9KmMhjF0lpVc2eCzEhsf
+kACK5gxkZo7HFq+/kdhwmC6bMWfhVZQaFyx8WPg0+w50SMrccpz6VwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSkvTHNRlqlEKBIDQlZjRdV
+1KY/GjANBgkqhkiG9w0BAQUFAAOCAQEALrIIQVRBTM+IjaGDSyL0Vv+M6DeD8+qy
+Bv93gksswuPBgUu6Sg4s/MG4I/XCKNnoB16q7cLh6NlDN4CN7WYZaGtblmw1lMnZ
+Nbgw/ghCQWpJZ1AmMlSpH0Ew2YunUdRjMqJlaopgGHD9NZgpAtH6qWAw8d8JdzgS
+H9tL3L6GOp7rQEbGxVm+IXMQdMCazchEskcT6qe7Bixh/QOi0Sd4ZQULhu0vVS8O
+Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
+8Vk3p9f3k2Uug3YtQK3uR3bZwffzni4GJqbYUq/ti8dcWMGZbBtyNg==
+</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>https://nya-21.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJg26jet2Q3XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMxWhcNMjEwMjI3
+MTYyODMxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0un7EXE+8dkUQ79q7iTAd5+Pmbh/Xr95
+Y/n6KQX833Td8UvGIIGOI9TASztBeC5+FA/7Niy8n5lXdA41u4PVnsAqkhqooyyG
+nM1RfCVUNnk3EW2+tCymUtp30LnKUSydPkvC2toeHZEb/o7kzq+Egcf+c80z+HjC
+Ut4mNqhuRv1sriX1PkbBnZwkL04/y+Wh9eXoCbVw0dJH6D7GazD3lwEaB7bPsy5c
+jtZSX89jFu8OrMI7B6pwvM/r2KYz0YT/75cSaM7UJwlb9KmMhjF0lpVc2eCzEhsf
+kACK5gxkZo7HFq+/kdhwmC6bMWfhVZQaFyx8WPg0+w50SMrccpz6VwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSkvTHNRlqlEKBIDQlZjRdV
+1KY/GjANBgkqhkiG9w0BAQUFAAOCAQEALrIIQVRBTM+IjaGDSyL0Vv+M6DeD8+qy
+Bv93gksswuPBgUu6Sg4s/MG4I/XCKNnoB16q7cLh6NlDN4CN7WYZaGtblmw1lMnZ
+Nbgw/ghCQWpJZ1AmMlSpH0Ew2YunUdRjMqJlaopgGHD9NZgpAtH6qWAw8d8JdzgS
+H9tL3L6GOp7rQEbGxVm+IXMQdMCazchEskcT6qe7Bixh/QOi0Sd4ZQULhu0vVS8O
+Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
+8Vk3p9f3k2Uug3YtQK3uR3bZwffzni4GJqbYUq/ti8dcWMGZbBtyNg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..bf572f77
--- /dev/null
+++ b/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-21.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQ0b083Blgbrp/w8LjZqbVaXRFNhKFD6O4wVEddJOQFhndHpDkxd7s4fJjqkX5HoSsiRuF9q1jYEC6oXB3ewasCAwEAAaN/MH0wHQYDVR0OBBYEFLk4lnFr0YledzWBhr7RAnOU4ERVME4GA1UdIwRHMEWAFLk4lnFr0YledzWBhr7RAnOU4ERVoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA5z9VLyypzA0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA9fR2rcfPQf2Md9+lNRMxlVhz8nLvVPZRnXW2DW12vpt4J7W4heWZdXBNMc6qbthHOZ+OMk0desbx2tte35qb4=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/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://nya-21.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQ0b083Blgbrp/w8LjZqbVaXRFNhKFD6O4wVEddJOQFhndHpDkxd7s4fJjqkX5HoSsiRuF9q1jYEC6oXB3ewasCAwEAAaN/MH0wHQYDVR0OBBYEFLk4lnFr0YledzWBhr7RAnOU4ERVME4GA1UdIwRHMEWAFLk4lnFr0YledzWBhr7RAnOU4ERVoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA5z9VLyypzA0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA9fR2rcfPQf2Md9+lNRMxlVhz8nLvVPZRnXW2DW12vpt4J7W4heWZdXBNMc6qbthHOZ+OMk0desbx2tte35qb4=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/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-1.0/nya-22.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..694ac131
--- /dev/null
+++ b/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-22.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL/aTBCXFYFuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMzWhcNMjEwMjI3
+MTYyODMzWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Mxgs/yjF5TNx+vpxZWBzqKES4LYwhuX
+kd9ldaWbP50eSrGHfiMXI2Appv/GalnunaYyJrs93M+ps6NBvBawh0K9scu5iRqN
+UeaHl7sK5yYeioC9kTAIVlgx8XnNxp6ph5IB6WG2tq4sIwKfviJhzq/oT+5CNogW
+Wcm94YFeSub3GYlCRXPQzJrpwCJtFG9YGmUwKCZG+p3kwvg//NbaA4KgipswVqqz
+gzDHIDg57KbAZGJ2V6PCskef5woKzByHybcyEppPhSQy5C0rtby6VWn2eP7B/NL1
+xBPSg3vXYDYVBqVkHlU+0TiLGyg9wyE4XoNZ1s69OdY1xl/ppQ5H7QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS4cpYWAXhdQx33Jk+WJ8Tu
+nR3iVjANBgkqhkiG9w0BAQUFAAOCAQEAHWK1GRsSC8yX0+74q3yalOxyD32a95Ta
+R7V6ff8MTcLSF6t9us20SNYgUIGnZto/bhxZZlID/H23dMpz5R4/4t3a1S5H1O79
+0XHUq8zAFxwAOXYcz1he+fxoKHR4JjeXspQmWfxlFYuxk4fUJd3v1TW0drEY1AtT
+8DAO/00TfJ8bRUKEHqi45gUGOhthFASzX8hhymscPAwicp+8KqJxcZEZBst6pVwE
+1z48lanCAPBq0TDhWE4N9KF41dMSgjCdCj080TekTQv/vNsPEVmKI1pBrhIG5f0o
+NioMjs/wGzv5NqI/lvVaTI3ZibsONLAm95E2YsAozUmXpf49XE630Q==
+</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>https://nya-22.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL/aTBCXFYFuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMzWhcNMjEwMjI3
+MTYyODMzWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Mxgs/yjF5TNx+vpxZWBzqKES4LYwhuX
+kd9ldaWbP50eSrGHfiMXI2Appv/GalnunaYyJrs93M+ps6NBvBawh0K9scu5iRqN
+UeaHl7sK5yYeioC9kTAIVlgx8XnNxp6ph5IB6WG2tq4sIwKfviJhzq/oT+5CNogW
+Wcm94YFeSub3GYlCRXPQzJrpwCJtFG9YGmUwKCZG+p3kwvg//NbaA4KgipswVqqz
+gzDHIDg57KbAZGJ2V6PCskef5woKzByHybcyEppPhSQy5C0rtby6VWn2eP7B/NL1
+xBPSg3vXYDYVBqVkHlU+0TiLGyg9wyE4XoNZ1s69OdY1xl/ppQ5H7QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS4cpYWAXhdQx33Jk+WJ8Tu
+nR3iVjANBgkqhkiG9w0BAQUFAAOCAQEAHWK1GRsSC8yX0+74q3yalOxyD32a95Ta
+R7V6ff8MTcLSF6t9us20SNYgUIGnZto/bhxZZlID/H23dMpz5R4/4t3a1S5H1O79
+0XHUq8zAFxwAOXYcz1he+fxoKHR4JjeXspQmWfxlFYuxk4fUJd3v1TW0drEY1AtT
+8DAO/00TfJ8bRUKEHqi45gUGOhthFASzX8hhymscPAwicp+8KqJxcZEZBst6pVwE
+1z48lanCAPBq0TDhWE4N9KF41dMSgjCdCj080TekTQv/vNsPEVmKI1pBrhIG5f0o
+NioMjs/wGzv5NqI/lvVaTI3ZibsONLAm95E2YsAozUmXpf49XE630Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..9ea005b3
--- /dev/null
+++ b/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-22.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKfkXD1Z7YURYCacXGiEwURSzxMns2ws+3/0duOfQ2u93kmNFxi8uX1RKZGFVQunJofc7MsC2vg9EgCXpjC+HEcCAwEAAaN/MH0wHQYDVR0OBBYEFINQ06+tab0DHHeHON4cbpom5jjjME4GA1UdIwRHMEWAFINQ06+tab0DHHeHON4cbpom5jjjoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAznwLEvlFT8owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFDeZ1zw6rmpoB72DIx8d9tUlJToEcvuNBkrwaHNkAxHUN1VZtUgE2NHuQ6bBx8E3nml5+7VMoiHtaB7z7G8aMw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/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://nya-22.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKfkXD1Z7YURYCacXGiEwURSzxMns2ws+3/0duOfQ2u93kmNFxi8uX1RKZGFVQunJofc7MsC2vg9EgCXpjC+HEcCAwEAAaN/MH0wHQYDVR0OBBYEFINQ06+tab0DHHeHON4cbpom5jjjME4GA1UdIwRHMEWAFINQ06+tab0DHHeHON4cbpom5jjjoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAznwLEvlFT8owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFDeZ1zw6rmpoB72DIx8d9tUlJToEcvuNBkrwaHNkAxHUN1VZtUgE2NHuQ6bBx8E3nml5+7VMoiHtaB7z7G8aMw=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/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-1.0/nya-22.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..78157379
--- /dev/null
+++ b/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-22.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL3GQkwodq22MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM0WhcNMjEwMjI3
+MTYyODM0WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EIplw5au2+YE8G6jRMrMFnR6qGS7vdJ
+Xd0AcfQ2CbmeBoTFOsGqlaPuIclgm8zaUg8qNZjiNDkrmgRqJHY+e8H0b3eCZFYE
+AuUXLuNPhV/NfAnQUrj0baKON58fCRwUXTwd1UDctaXq1D5SOz+WJ5hIv10lV9vM
+65XTNDkC7n+gim1yFWOPkvCPXJPe5VsMbs/RdhC98Vq/kiJnEYyYSd0S+vTUf5IB
+FiFoQY92jfvVLBBiZ8G5ITnCaVgVctAA3WRJYIqy5BWQXEKQZmr1T8ViOrKVtO4W
+wpbFBEKSdrTPC+ehyM6yDCl65jxra6Hiz/rPYPvpSlSgmJF5/dX+PwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSgJAqQkgguofAIs/0PdC5P
+d16G7DANBgkqhkiG9w0BAQUFAAOCAQEA5iVBp6sW5O1XuM3xDbTCySBZRv+Jhpjh
+q6gC9rVi4Bc4yc70j87GMQik/RPY/9uDYgw7vzjFNybuytYn7JkVq7K07HyeDj54
+/hTg7mz9SZ5vbkSxDh4ZS2V/GI8LJ4uDY+nfrX2xYbL6FaNIPTdvgCx94QvblFnV
+jFydADnVWPe20nUWApcYS9zFTX3+LLdWvtsL26tptIyxXolw2X8EM8+v9ENAdw4L
+jjj00wCW6g2lDQOxg6DdDvW59FmCG/Kjiuaj8HX4aOchdnp4jz30sBXFB6wa0v4Q
+ANjqu5Nik7dmEdQabHioZWmiBHz7BIxsVeBq4knZsD8xIapdJcMQUw==
+</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>https://nya-22.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL3GQkwodq22MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM0WhcNMjEwMjI3
+MTYyODM0WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EIplw5au2+YE8G6jRMrMFnR6qGS7vdJ
+Xd0AcfQ2CbmeBoTFOsGqlaPuIclgm8zaUg8qNZjiNDkrmgRqJHY+e8H0b3eCZFYE
+AuUXLuNPhV/NfAnQUrj0baKON58fCRwUXTwd1UDctaXq1D5SOz+WJ5hIv10lV9vM
+65XTNDkC7n+gim1yFWOPkvCPXJPe5VsMbs/RdhC98Vq/kiJnEYyYSd0S+vTUf5IB
+FiFoQY92jfvVLBBiZ8G5ITnCaVgVctAA3WRJYIqy5BWQXEKQZmr1T8ViOrKVtO4W
+wpbFBEKSdrTPC+ehyM6yDCl65jxra6Hiz/rPYPvpSlSgmJF5/dX+PwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSgJAqQkgguofAIs/0PdC5P
+d16G7DANBgkqhkiG9w0BAQUFAAOCAQEA5iVBp6sW5O1XuM3xDbTCySBZRv+Jhpjh
+q6gC9rVi4Bc4yc70j87GMQik/RPY/9uDYgw7vzjFNybuytYn7JkVq7K07HyeDj54
+/hTg7mz9SZ5vbkSxDh4ZS2V/GI8LJ4uDY+nfrX2xYbL6FaNIPTdvgCx94QvblFnV
+jFydADnVWPe20nUWApcYS9zFTX3+LLdWvtsL26tptIyxXolw2X8EM8+v9ENAdw4L
+jjj00wCW6g2lDQOxg6DdDvW59FmCG/Kjiuaj8HX4aOchdnp4jz30sBXFB6wa0v4Q
+ANjqu5Nik7dmEdQabHioZWmiBHz7BIxsVeBq4knZsD8xIapdJcMQUw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..f419483c
--- /dev/null
+++ b/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-22.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANtWeRGcKBmwSJxCA2mZ/dfcFazEB4Y4Jv3KFiMkR4FF9mUZ3S9+0nAjQMLIEGKly0ynGSK4VKWwTR3BWkhUJxECAwEAAaN/MH0wHQYDVR0OBBYEFKcj7IvlZXoq0b0b7H+ohVc37skMME4GA1UdIwRHMEWAFKcj7IvlZXoq0b0b7H+ohVc37skMoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAhQZICpVe8ZIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKhnsKi2vSdPeTu5W8BzWl708Ztb7F2HJMKsPAVpHk9KAhqtqyi/GIxMBQxDGTWrs2Jy6RJnwF1ECEXZLNkz9GM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/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://nya-22.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANtWeRGcKBmwSJxCA2mZ/dfcFazEB4Y4Jv3KFiMkR4FF9mUZ3S9+0nAjQMLIEGKly0ynGSK4VKWwTR3BWkhUJxECAwEAAaN/MH0wHQYDVR0OBBYEFKcj7IvlZXoq0b0b7H+ohVc37skMME4GA1UdIwRHMEWAFKcj7IvlZXoq0b0b7H+ohVc37skMoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAhQZICpVe8ZIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKhnsKi2vSdPeTu5W8BzWl708Ztb7F2HJMKsPAVpHk9KAhqtqyi/GIxMBQxDGTWrs2Jy6RJnwF1ECEXZLNkz9GM=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/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-1.0/nya-23.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..27e34311
--- /dev/null
+++ b/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-23.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANbg77cPnGZEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM2WhcNMjEwMjI3
+MTYyODM2WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxhH9acWrdKXqRaTkncTfzdWDFiwsyddB
+MeM6AZdLeOUT8bp1i4UDh388Tx8mj2h9G9Ih7T9TEHRehsU8WL/A64LuLEmCaO3a
+YcWYE9u20yPXalX98W+SqNq7CuhxVJLHVIayHR+iM1Qa0rvsWrBxMwFJWVocbgOu
+mseXFNlwhFCJFqXhkiC6s6GBQYw6L3e/CsArOpnPsoAQ2B2ldoWIG7keFN+NPmv2
+u9TR2/bb0LH6jOBmphH+BsvF9dnoagnWAFV20JHoW06gqYDMBWTOElvc8jRqm2za
+meFgYp3/aTQMVSlvHLZXt+Zbhnxxbu4JbTC3bi/SU1IhxXvL1OBdTwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPllnJxLu+OmPTLGSpcc2q
+fXPYEjANBgkqhkiG9w0BAQUFAAOCAQEAASmwzSeiFNVIEkdomh0mug9XdAli42Co
+djyoL5+EMO0GYqzdM0lv99sTWWk6VEwIn0qHRZmqbxZ+Cr32Rqc0V6sSkCtiVzf5
+iIsaRCBb53NFd1JjLAGsyTm7pbQTp+nt/eM9QLn3MELe6f897Y9TPJcaFOfqOuSw
+1oN2G9n1//65GYs8De0E8aKPJ8lLueOzwXA+KcgdpqJgyxCfWb/e5QMe77YKngB5
+WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
+/6CV2q2TLkNFEO7evEjnea6czBgrgQSL3NBVAtv/rIoH2e2vIrAmKg==
+</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>https://nya-23.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANbg77cPnGZEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM2WhcNMjEwMjI3
+MTYyODM2WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxhH9acWrdKXqRaTkncTfzdWDFiwsyddB
+MeM6AZdLeOUT8bp1i4UDh388Tx8mj2h9G9Ih7T9TEHRehsU8WL/A64LuLEmCaO3a
+YcWYE9u20yPXalX98W+SqNq7CuhxVJLHVIayHR+iM1Qa0rvsWrBxMwFJWVocbgOu
+mseXFNlwhFCJFqXhkiC6s6GBQYw6L3e/CsArOpnPsoAQ2B2ldoWIG7keFN+NPmv2
+u9TR2/bb0LH6jOBmphH+BsvF9dnoagnWAFV20JHoW06gqYDMBWTOElvc8jRqm2za
+meFgYp3/aTQMVSlvHLZXt+Zbhnxxbu4JbTC3bi/SU1IhxXvL1OBdTwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPllnJxLu+OmPTLGSpcc2q
+fXPYEjANBgkqhkiG9w0BAQUFAAOCAQEAASmwzSeiFNVIEkdomh0mug9XdAli42Co
+djyoL5+EMO0GYqzdM0lv99sTWWk6VEwIn0qHRZmqbxZ+Cr32Rqc0V6sSkCtiVzf5
+iIsaRCBb53NFd1JjLAGsyTm7pbQTp+nt/eM9QLn3MELe6f897Y9TPJcaFOfqOuSw
+1oN2G9n1//65GYs8De0E8aKPJ8lLueOzwXA+KcgdpqJgyxCfWb/e5QMe77YKngB5
+WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
+/6CV2q2TLkNFEO7evEjnea6czBgrgQSL3NBVAtv/rIoH2e2vIrAmKg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..c027b8a0
--- /dev/null
+++ b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-23.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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://nya-23.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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-1.0/nya-23.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..f2b5147e
--- /dev/null
+++ b/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-23.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALre7sAe5ozlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM3WhcNMjEwMjI3
+MTYyODM3WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPQ7MLqPI32J4tGKyVUadTxnywwQYQoI
+q0dmCAvd3TvbiGv3sXCKCzKSnsQ060kdcLj3WZRhqcFkHBccaiKw7InAo/g6cyyJ
+a/Ao5mf1cYUNEBcEvLyg5FWuOW8hUE6S9Qwi747SBQqqQsIr7PrmkLlgl/l1u9bz
+EQDcsrW3HFeGqo7juobOB1sVp2I291NJ4Aj+cO0+pbExYKOftVPig8WOiV9hizHk
+Q6Ou8mPMO1G2QHRFXK0usIz9Gl7Zd8WLI8f5/DQN5+J70hvurRYfPjWjh6NzMss6
+UDyzOfHCzZDTrSMF0mIhZcZ4cBELT8TyIF181FpwF/mS/fl2cEaB4wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTNRq59HkUZ8LiymaVyfzLj
+VV0lATANBgkqhkiG9w0BAQUFAAOCAQEAj/XhxkHfASY48DcmYC8vwbY1FOSQ4DQi
+XqwlUHt1q9r1CcmcrIlW8Ol0vIIxbYRMe+XzRATdgbmYc0PcMqqpO9EJH8cwMHKp
+yJsUh4IObl2iGM4XWBt/zKVGuL64GCsyPUnoXLox+MdQEmI6O5RyrTisJL/XJbro
+KBNJ2FV9QJ/Ti2LhViTGGKV5lJ8YD9eC/3cZwtEizL4UE2yhx4eVYCXMTJYikimN
+D/EHQd/XrAoj/qoPpTKzeS9rHX+poV1qaWJtTyCLsNx/hj2QaO4fAADyAhoSp5qI
+0YrJqdPY8mVMrVicaGRM2hrslHgtaioXNiypq7chN3SaoQolotAGjA==
+</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>https://nya-23.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALre7sAe5ozlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM3WhcNMjEwMjI3
+MTYyODM3WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPQ7MLqPI32J4tGKyVUadTxnywwQYQoI
+q0dmCAvd3TvbiGv3sXCKCzKSnsQ060kdcLj3WZRhqcFkHBccaiKw7InAo/g6cyyJ
+a/Ao5mf1cYUNEBcEvLyg5FWuOW8hUE6S9Qwi747SBQqqQsIr7PrmkLlgl/l1u9bz
+EQDcsrW3HFeGqo7juobOB1sVp2I291NJ4Aj+cO0+pbExYKOftVPig8WOiV9hizHk
+Q6Ou8mPMO1G2QHRFXK0usIz9Gl7Zd8WLI8f5/DQN5+J70hvurRYfPjWjh6NzMss6
+UDyzOfHCzZDTrSMF0mIhZcZ4cBELT8TyIF181FpwF/mS/fl2cEaB4wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTNRq59HkUZ8LiymaVyfzLj
+VV0lATANBgkqhkiG9w0BAQUFAAOCAQEAj/XhxkHfASY48DcmYC8vwbY1FOSQ4DQi
+XqwlUHt1q9r1CcmcrIlW8Ol0vIIxbYRMe+XzRATdgbmYc0PcMqqpO9EJH8cwMHKp
+yJsUh4IObl2iGM4XWBt/zKVGuL64GCsyPUnoXLox+MdQEmI6O5RyrTisJL/XJbro
+KBNJ2FV9QJ/Ti2LhViTGGKV5lJ8YD9eC/3cZwtEizL4UE2yhx4eVYCXMTJYikimN
+D/EHQd/XrAoj/qoPpTKzeS9rHX+poV1qaWJtTyCLsNx/hj2QaO4fAADyAhoSp5qI
+0YrJqdPY8mVMrVicaGRM2hrslHgtaioXNiypq7chN3SaoQolotAGjA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..db034e2c
--- /dev/null
+++ b/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-23.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN/PvmIePjKFW6Va6I6eK+XxVIXdykJe+GY9l3PTOIALhUb4ir92jWlGQYXpXTh/+WqJGwfoPL+5mdq3WK7lKt8CAwEAAaN/MH0wHQYDVR0OBBYEFCWiF7BkM/zs86okl98WdQsWe6I2ME4GA1UdIwRHMEWAFCWiF7BkM/zs86okl98WdQsWe6I2oSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkApAH/b7WwapowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAx8AB7lnuhRQEImiTj99mnA8qBVbCRxEh6WVG4vURf2jUQmUpn6CarLuPeCh/KTpAEcVxVFo+GLyhn5e+gt6Lc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/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://nya-23.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN/PvmIePjKFW6Va6I6eK+XxVIXdykJe+GY9l3PTOIALhUb4ir92jWlGQYXpXTh/+WqJGwfoPL+5mdq3WK7lKt8CAwEAAaN/MH0wHQYDVR0OBBYEFCWiF7BkM/zs86okl98WdQsWe6I2ME4GA1UdIwRHMEWAFCWiF7BkM/zs86okl98WdQsWe6I2oSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkApAH/b7WwapowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAx8AB7lnuhRQEImiTj99mnA8qBVbCRxEh6WVG4vURf2jUQmUpn6CarLuPeCh/KTpAEcVxVFo+GLyhn5e+gt6Lc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/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-1.0/nya-24.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..ba3b76ef
--- /dev/null
+++ b/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-24.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJWdCC4u6nzdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM5WhcNMjEwMjI3
+MTYyODM5WjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyAVm4ULVNO3mk0hqel0dFiD5BSpFVvpZ
+qSIWtrTB0BA7pWRtPk5/c7LMg4t5u0PYCGY402nuSt/wm5Q6HwLG9iF6IUJRrtBs
+weYu0lgaSVRzk4EURwwsvAbvPQXtS3OCkNjRAtWVBBQh95cJifHtVZYIIoE/8A4u
+6pUsgfrxbvFbvwea2nLG7aBLk4d/hosuuxhwKKqMElT3pCbNYOlZAgZgXhTDKR/Q
+5TTFOxCkW3hWwhs0cneIUbexzSrJ/ZJvtXcmhVBHau9v+N0twIua8IfUpGxIaqtN
+PUOhf+UlatTN5zEoRDjHnmrumXX0xC3QD1o+mWX2fu5ZEyRBFae07wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTWGMKg7imhqpSnYcgKYKT4
+8NAHlDANBgkqhkiG9w0BAQUFAAOCAQEAi4YTPYhaP8GlGhowv27s+aI6b5q3ZOE8
+Mc7dFJDT7/1Hqg6lYIAsDNJSCNS5sDTFk6PN7xOaFhwB6U+UU3fT+k2jF7BDaT7t
+xV8dJFQLOVRmF6U7UVYzIvhtskhDpdohmZtsWY+eBNsvHDyMMiA/1WWNgldqdCv0
+xTbp4W1xbzmM8jc17OFcHLUHZGvkLfuVcBV50XOQq5SNQqR0QjOCF5j16Uogu4CK
+6WDtx1WcT097v6VxOoNci3ivadFQT2xnBsoo4bu79sP6kK6ItZgjAG3/2EEnpCYE
+pN+aHLN+CCLWIwcveWDJkn3GF7UN6H2hos6GvtnwrkLw7VNasMM/iw==
+</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>https://nya-24.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJWdCC4u6nzdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM5WhcNMjEwMjI3
+MTYyODM5WjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyAVm4ULVNO3mk0hqel0dFiD5BSpFVvpZ
+qSIWtrTB0BA7pWRtPk5/c7LMg4t5u0PYCGY402nuSt/wm5Q6HwLG9iF6IUJRrtBs
+weYu0lgaSVRzk4EURwwsvAbvPQXtS3OCkNjRAtWVBBQh95cJifHtVZYIIoE/8A4u
+6pUsgfrxbvFbvwea2nLG7aBLk4d/hosuuxhwKKqMElT3pCbNYOlZAgZgXhTDKR/Q
+5TTFOxCkW3hWwhs0cneIUbexzSrJ/ZJvtXcmhVBHau9v+N0twIua8IfUpGxIaqtN
+PUOhf+UlatTN5zEoRDjHnmrumXX0xC3QD1o+mWX2fu5ZEyRBFae07wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTWGMKg7imhqpSnYcgKYKT4
+8NAHlDANBgkqhkiG9w0BAQUFAAOCAQEAi4YTPYhaP8GlGhowv27s+aI6b5q3ZOE8
+Mc7dFJDT7/1Hqg6lYIAsDNJSCNS5sDTFk6PN7xOaFhwB6U+UU3fT+k2jF7BDaT7t
+xV8dJFQLOVRmF6U7UVYzIvhtskhDpdohmZtsWY+eBNsvHDyMMiA/1WWNgldqdCv0
+xTbp4W1xbzmM8jc17OFcHLUHZGvkLfuVcBV50XOQq5SNQqR0QjOCF5j16Uogu4CK
+6WDtx1WcT097v6VxOoNci3ivadFQT2xnBsoo4bu79sP6kK6ItZgjAG3/2EEnpCYE
+pN+aHLN+CCLWIwcveWDJkn3GF7UN6H2hos6GvtnwrkLw7VNasMM/iw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..e9eda611
--- /dev/null
+++ b/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-24.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXWMsS5is4X6dCQciuul6t+PBdpkHGETmeDH9NAe0ZkoZ+6VDCMZ/F0IL+NrtxZEK02doazRGm0gkRU2HOPJPcCAwEAAaN/MH0wHQYDVR0OBBYEFJCB24n8pOVO/RjtgbnPR/lB41SBME4GA1UdIwRHMEWAFJCB24n8pOVO/RjtgbnPR/lB41SBoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAkGWj3fU7SQMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJIfkPpRX01NMt+zeWez/cNcltWjcJSo9huh7Okd2P9N4gqpNwhydtpKMUtfNz3reeXrQ1vESbrdUAJl7CPrWNE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/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://nya-24.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXWMsS5is4X6dCQciuul6t+PBdpkHGETmeDH9NAe0ZkoZ+6VDCMZ/F0IL+NrtxZEK02doazRGm0gkRU2HOPJPcCAwEAAaN/MH0wHQYDVR0OBBYEFJCB24n8pOVO/RjtgbnPR/lB41SBME4GA1UdIwRHMEWAFJCB24n8pOVO/RjtgbnPR/lB41SBoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAkGWj3fU7SQMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJIfkPpRX01NMt+zeWez/cNcltWjcJSo9huh7Okd2P9N4gqpNwhydtpKMUtfNz3reeXrQ1vESbrdUAJl7CPrWNE=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/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-1.0/nya-24.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ec268f21
--- /dev/null
+++ b/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-24.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK713ALYAB9MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQwWhcNMjEwMjI3
+MTYyODQwWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FTy3dn7iCtDAEWmjJJxVdRs//aYtBqL
+Qe0eyeh8s6ZTqy00anqcG2d+IBsMVp3YHYf2m5iBdxPOUBskXTa5nMOBGZHq1ETR
+4WgbwnA/BXiBOvO0U13bFe/+Ki7/8UC7hnKJa4+DEK7Ix/5qcsbm8ycQNn0KcIse
+ZvCQ0BUFf91poUPzBj6VHoEygm1wCwgk1KTK0ydk7iq77UQlSLiguYS6xeRsGguK
+OCYaIYPRyHHenqzTuj0hwOeRfJsJigpLcMCgLSuGYbA7yNLCFqAKVDCMApNqdKpJ
+ttSwusQvXCcWzWOikasEteIqnaQvFaLloxZfYmiOpJI0Gr/WU9+HxwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRYG+yDfHlrXlfaaLEdiNQo
+altoJDANBgkqhkiG9w0BAQUFAAOCAQEAZIZlCdR5Y7+cWQIOSy9UIYImLhduZhO5
+PRSF2pTIkOc5GVU8XiQfvXE4cIz81eHTuQzD17Mj0vpJZ+Kff3UzlC2UdGvLZFJq
+GbNw/X0iNlTDGFqmV1gUoaDYdjscXDfUMvyxDPgqqC9Br51Hx3lUE0Rz0vc5Pvad
+k6+YrXv6JqVBG2CxPn+6S4RRexRpwl+ZcVYnSQd4hGc8EpERBsoaoOTVoPlPCSd/
+2/tUFqk0+1ohnogsUBgF/XoxTjO3JGpSrTRpGi5Kodlwn15BMFfH01PBZTQUE22N
+jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
+</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>https://nya-24.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK713ALYAB9MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQwWhcNMjEwMjI3
+MTYyODQwWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FTy3dn7iCtDAEWmjJJxVdRs//aYtBqL
+Qe0eyeh8s6ZTqy00anqcG2d+IBsMVp3YHYf2m5iBdxPOUBskXTa5nMOBGZHq1ETR
+4WgbwnA/BXiBOvO0U13bFe/+Ki7/8UC7hnKJa4+DEK7Ix/5qcsbm8ycQNn0KcIse
+ZvCQ0BUFf91poUPzBj6VHoEygm1wCwgk1KTK0ydk7iq77UQlSLiguYS6xeRsGguK
+OCYaIYPRyHHenqzTuj0hwOeRfJsJigpLcMCgLSuGYbA7yNLCFqAKVDCMApNqdKpJ
+ttSwusQvXCcWzWOikasEteIqnaQvFaLloxZfYmiOpJI0Gr/WU9+HxwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRYG+yDfHlrXlfaaLEdiNQo
+altoJDANBgkqhkiG9w0BAQUFAAOCAQEAZIZlCdR5Y7+cWQIOSy9UIYImLhduZhO5
+PRSF2pTIkOc5GVU8XiQfvXE4cIz81eHTuQzD17Mj0vpJZ+Kff3UzlC2UdGvLZFJq
+GbNw/X0iNlTDGFqmV1gUoaDYdjscXDfUMvyxDPgqqC9Br51Hx3lUE0Rz0vc5Pvad
+k6+YrXv6JqVBG2CxPn+6S4RRexRpwl+ZcVYnSQd4hGc8EpERBsoaoOTVoPlPCSd/
+2/tUFqk0+1ohnogsUBgF/XoxTjO3JGpSrTRpGi5Kodlwn15BMFfH01PBZTQUE22N
+jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..5f0a9284
--- /dev/null
+++ b/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-24.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEqEGh6Sg9lfhIQPNowivKjqnD0BRc9Dz5THbunWl9EfN3BCUU4CJjPnSsf4HzS04GL1IPV/EyZkETvRQxaB5MCAwEAAaN/MH0wHQYDVR0OBBYEFA5WEJDvVkGd9qY/JMJk0ORtkmTeME4GA1UdIwRHMEWAFA5WEJDvVkGd9qY/JMJk0ORtkmTeoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAhhrQP+6+7VUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEvuBQiZh7Ln/N5iWYHRwLB7mXbw+OFsY7YLlACxc5D/siX7NrD4XSIzUB0hJUtxuCh28ddOOV+RBHQU3pgYj1w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/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://nya-24.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEqEGh6Sg9lfhIQPNowivKjqnD0BRc9Dz5THbunWl9EfN3BCUU4CJjPnSsf4HzS04GL1IPV/EyZkETvRQxaB5MCAwEAAaN/MH0wHQYDVR0OBBYEFA5WEJDvVkGd9qY/JMJk0ORtkmTeME4GA1UdIwRHMEWAFA5WEJDvVkGd9qY/JMJk0ORtkmTeoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAhhrQP+6+7VUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEvuBQiZh7Ln/N5iWYHRwLB7mXbw+OFsY7YLlACxc5D/siX7NrD4XSIzUB0hJUtxuCh28ddOOV+RBHQU3pgYj1w=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/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-1.0/nya-25.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..613be0e1
--- /dev/null
+++ b/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-25.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPyhXHCVywzcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQyWhcNMjEwMjI3
+MTYyODQyWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6kngf3uludc3rumLrFUX+8OQA5Z3gvC3
+TGfcWvPjpnF0mMvQt8lpB4Ctfg91IT3ogv9igZRvAyvEcyVNhQJHLpfK7oyeYeX2
+NBh8bYXhddYmrA4EgFyfpCHSavmleryM6yBV6PsdnatrL0B2for1lU2hbwqoZJyR
+zxer9xaFmeGe6tL2OcwYQfRGrPqKGeMd4qd0LYZ/ci0L90Mf4QDsZn1RuPLR8NkA
+nT9zuWaminu7+R37wP7YG86CLbbyR5mvPGyhR71at5Bbuash3F3iX3NfCFoRTV4Y
+ZUC/TahoCve1XWyT/wPomATKx5BLvaO8tHg7Cn3+5fU75XrSt57GzwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSL7XIkNrGrilg9Oc3VoNVY
+v5+wdTANBgkqhkiG9w0BAQUFAAOCAQEA1NNPHf278DOaknm7oixU9BYlCj4Xo48J
+tYX+aIkEZgSoC4lZKj5Aa5HZmPxYBha0Of9PnDf5CyFsOSZ6uzIBA+kK4M8fdsTm
+3cXDwoGktFHV6tPREKcM3y7vjzRj1NP4f5zmIRett0mGM2117hNxGbQ02ihr6r6G
+nfY+6KZTveW/1DOzr7X68zbFGS0+B2Kah6f2jzYuJcMsez86aurqjs1I7JG6wMEP
+gXBqbiL4/Fcu3K0+U3yZzaEhqoG4tbRiLyEG9QJRXilJNoe+uMgnKdRta+25WfUp
+kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
+</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>https://nya-25.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPyhXHCVywzcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQyWhcNMjEwMjI3
+MTYyODQyWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6kngf3uludc3rumLrFUX+8OQA5Z3gvC3
+TGfcWvPjpnF0mMvQt8lpB4Ctfg91IT3ogv9igZRvAyvEcyVNhQJHLpfK7oyeYeX2
+NBh8bYXhddYmrA4EgFyfpCHSavmleryM6yBV6PsdnatrL0B2for1lU2hbwqoZJyR
+zxer9xaFmeGe6tL2OcwYQfRGrPqKGeMd4qd0LYZ/ci0L90Mf4QDsZn1RuPLR8NkA
+nT9zuWaminu7+R37wP7YG86CLbbyR5mvPGyhR71at5Bbuash3F3iX3NfCFoRTV4Y
+ZUC/TahoCve1XWyT/wPomATKx5BLvaO8tHg7Cn3+5fU75XrSt57GzwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSL7XIkNrGrilg9Oc3VoNVY
+v5+wdTANBgkqhkiG9w0BAQUFAAOCAQEA1NNPHf278DOaknm7oixU9BYlCj4Xo48J
+tYX+aIkEZgSoC4lZKj5Aa5HZmPxYBha0Of9PnDf5CyFsOSZ6uzIBA+kK4M8fdsTm
+3cXDwoGktFHV6tPREKcM3y7vjzRj1NP4f5zmIRett0mGM2117hNxGbQ02ihr6r6G
+nfY+6KZTveW/1DOzr7X68zbFGS0+B2Kah6f2jzYuJcMsez86aurqjs1I7JG6wMEP
+gXBqbiL4/Fcu3K0+U3yZzaEhqoG4tbRiLyEG9QJRXilJNoe+uMgnKdRta+25WfUp
+kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..c8c39c48
--- /dev/null
+++ b/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-25.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALWn6WCArMQJhfduLd/uW1MPPxY6vMFeBLXWKKz7XtnJf87ZiiORcB+y0FzamFU0789i1CpoINf+YRG88xPK9lECAwEAAaN/MH0wHQYDVR0OBBYEFI1Uxf3NMwsjkdXFSpo7hjPR1asBME4GA1UdIwRHMEWAFI1Uxf3NMwsjkdXFSpo7hjPR1asBoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkArtzybLmmH6gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHvGsE/AO9v+C43wylKpRFHMYl1L5JrKLepsxM9A2bj2FcXo8g1poBqAiQ1T58IkQpYrmKUZYEBefkkow5rWGo8=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/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://nya-25.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALWn6WCArMQJhfduLd/uW1MPPxY6vMFeBLXWKKz7XtnJf87ZiiORcB+y0FzamFU0789i1CpoINf+YRG88xPK9lECAwEAAaN/MH0wHQYDVR0OBBYEFI1Uxf3NMwsjkdXFSpo7hjPR1asBME4GA1UdIwRHMEWAFI1Uxf3NMwsjkdXFSpo7hjPR1asBoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkArtzybLmmH6gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHvGsE/AO9v+C43wylKpRFHMYl1L5JrKLepsxM9A2bj2FcXo8g1poBqAiQ1T58IkQpYrmKUZYEBefkkow5rWGo8=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/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-1.0/nya-25.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..76d5bebc
--- /dev/null
+++ b/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-25.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALwUSHQ3qkJpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3
+MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqTGHLrrNH1tvki7NlnizZsNL6FtZTKL
+BwHv9bVtyy4e0I2AMs278vZtUk5AWEIr8Y3PAD8hjhDvW0yEubku7eLNFFS9WNyY
+HGjpLN1TPIGizer2wj9UFKfTQj9CBkOi2WZJRa5mcziCErN7O06LNzDOogoPmiHX
+d0TaDP3YJaMpw1xY7mqWioM4ATzlKU/lqJyoIJwnCm9t174fEnWIQBVUD6Fa7m2d
+q+8+2QmYFUE/eWHiDRxB3zsx3K+2DDrcseOxSw5y23Aa3sgPozz4eG7ncIBZKtbO
+hXyVYtrLs7P0dPVVrPyxzU+2462jbJ3R85LY7+HfRipD0tfssH81ZQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQPehx6KmClTeH1dqHcj7ho
+FTtIXTANBgkqhkiG9w0BAQUFAAOCAQEAYXTArIhJw9ydQpYXTgidHjHfpkhsnD9k
+bzR1yGXFr1nJamZIHI1BC2OFNn0ORxfqHir2uA+44GiyvVPKbGQ3Ju5BkMbCkC78
+K9rJ+s2WhMlh1LpIT2/y7e/105KBYZ1+GO0TM6F7l0yVDlB0r1TtBqq8mmgR9UDY
+tGrSVVuKzm08GxuLtHrZgnWr2c7Gg1Z2oj1wLiipIuiT4gMF2I9FsCANcCcHaHpu
+p7XjWLjtjC9lD9wn82J8zsxswWiqsFo1pQ8FsW1wemslO7mR1bmMrg2VyCzC5AcZ
+BwTfEfdEuaZ8Qw506JRGKv9VbiefYZ9Tv57lD5mq7h4AIus5MiGNLQ==
+</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>https://nya-25.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALwUSHQ3qkJpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3
+MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqTGHLrrNH1tvki7NlnizZsNL6FtZTKL
+BwHv9bVtyy4e0I2AMs278vZtUk5AWEIr8Y3PAD8hjhDvW0yEubku7eLNFFS9WNyY
+HGjpLN1TPIGizer2wj9UFKfTQj9CBkOi2WZJRa5mcziCErN7O06LNzDOogoPmiHX
+d0TaDP3YJaMpw1xY7mqWioM4ATzlKU/lqJyoIJwnCm9t174fEnWIQBVUD6Fa7m2d
+q+8+2QmYFUE/eWHiDRxB3zsx3K+2DDrcseOxSw5y23Aa3sgPozz4eG7ncIBZKtbO
+hXyVYtrLs7P0dPVVrPyxzU+2462jbJ3R85LY7+HfRipD0tfssH81ZQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQPehx6KmClTeH1dqHcj7ho
+FTtIXTANBgkqhkiG9w0BAQUFAAOCAQEAYXTArIhJw9ydQpYXTgidHjHfpkhsnD9k
+bzR1yGXFr1nJamZIHI1BC2OFNn0ORxfqHir2uA+44GiyvVPKbGQ3Ju5BkMbCkC78
+K9rJ+s2WhMlh1LpIT2/y7e/105KBYZ1+GO0TM6F7l0yVDlB0r1TtBqq8mmgR9UDY
+tGrSVVuKzm08GxuLtHrZgnWr2c7Gg1Z2oj1wLiipIuiT4gMF2I9FsCANcCcHaHpu
+p7XjWLjtjC9lD9wn82J8zsxswWiqsFo1pQ8FsW1wemslO7mR1bmMrg2VyCzC5AcZ
+BwTfEfdEuaZ8Qw506JRGKv9VbiefYZ9Tv57lD5mq7h4AIus5MiGNLQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c85ef5fb
--- /dev/null
+++ b/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-25.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ0WhcNMjEwMjI3MTYyODQ0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALRqVYZb+AO+i0F6wLlZHlCsa+umtgklRNIdnL0QAYbM43D9iADkxAxzpFsPC6ZjHcy6558ais/mNCXfGtGcVRECAwEAAaN/MH0wHQYDVR0OBBYEFNBCF+sf0xRGPoa0nvej/sz9OG6bME4GA1UdIwRHMEWAFNBCF+sf0xRGPoa0nvej/sz9OG6boSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA+Y9bCFkGvlswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJKJpOrx90DSEFuzxrz5JgBZWU9FmwlIX1xs0Wptkwf7hpjFXvAAdnrU1YWHf5SWyQucVDqCAYT8BQLB0yujc+s=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/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://nya-25.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ0WhcNMjEwMjI3MTYyODQ0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALRqVYZb+AO+i0F6wLlZHlCsa+umtgklRNIdnL0QAYbM43D9iADkxAxzpFsPC6ZjHcy6558ais/mNCXfGtGcVRECAwEAAaN/MH0wHQYDVR0OBBYEFNBCF+sf0xRGPoa0nvej/sz9OG6bME4GA1UdIwRHMEWAFNBCF+sf0xRGPoa0nvej/sz9OG6boSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA+Y9bCFkGvlswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJKJpOrx90DSEFuzxrz5JgBZWU9FmwlIX1xs0Wptkwf7hpjFXvAAdnrU1YWHf5SWyQucVDqCAYT8BQLB0yujc+s=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/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-1.0/nya-26.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..00eff4c1
--- /dev/null
+++ b/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-26.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJMRJTWdT+jWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ1WhcNMjEwMjI3
+MTYyODQ1WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrut6VJJxu/wcH5cSjEE3/IgejRNbDTf
+NM9UKz3bnQ25n6TCP9NWD4VrlSArf/tvJU8FrvFE0DWg3pXy+HZriUwGVWOspLhF
+in97AiIw0rElvpCf1O5p4PBRBAXwe/Ron8K4NX64mynVI5UA8jT+LozeprLHuDOA
+R5Mqen22fYsqxxDa30s9qdmU70eexM8BnwLbebDfJ+8tkjxdyYwp6JvZXJW9h9ht
+O9rXUJcXDjNBAW0Kj3iRE0KddC34mukFU0utGc8aNbxAEC1V/mAr0UbQemnI1IRE
+/4Oa8p09lbbPDeU16JzasJwHqzmqEhh+H6aekj7n//QObE7MaDJo/wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSqPLWo77i+bj3oT8WfSidc
+6B4G4DANBgkqhkiG9w0BAQUFAAOCAQEAkxnvzAFJbs1U1INVh+eA44P4S7vFsyW7
+nCsUsRQHNW7AtmrDNURRVgnbni+tCzpDfKJP+V8x8tAKSwA4x12NMCUiW7blAeNO
+aJa8AXHmX8hOlLl/UGwlXqersvJaSb9WkaVyhdeRCHugmH+f8Qz5m8pBDm5zMRgc
+TOUzUhrC3aYqfm3nuCcReB3yn1LpyKe5oGzUBvrDAtME7XM87mc4w3tJRCnp8HX7
+IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
+9hnnNk0rP0HZsyJNtCXezQxMoznT2V9XmkuNr1rKfgSNaSTQ6MW/wQ==
+</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>https://nya-26.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJMRJTWdT+jWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ1WhcNMjEwMjI3
+MTYyODQ1WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrut6VJJxu/wcH5cSjEE3/IgejRNbDTf
+NM9UKz3bnQ25n6TCP9NWD4VrlSArf/tvJU8FrvFE0DWg3pXy+HZriUwGVWOspLhF
+in97AiIw0rElvpCf1O5p4PBRBAXwe/Ron8K4NX64mynVI5UA8jT+LozeprLHuDOA
+R5Mqen22fYsqxxDa30s9qdmU70eexM8BnwLbebDfJ+8tkjxdyYwp6JvZXJW9h9ht
+O9rXUJcXDjNBAW0Kj3iRE0KddC34mukFU0utGc8aNbxAEC1V/mAr0UbQemnI1IRE
+/4Oa8p09lbbPDeU16JzasJwHqzmqEhh+H6aekj7n//QObE7MaDJo/wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSqPLWo77i+bj3oT8WfSidc
+6B4G4DANBgkqhkiG9w0BAQUFAAOCAQEAkxnvzAFJbs1U1INVh+eA44P4S7vFsyW7
+nCsUsRQHNW7AtmrDNURRVgnbni+tCzpDfKJP+V8x8tAKSwA4x12NMCUiW7blAeNO
+aJa8AXHmX8hOlLl/UGwlXqersvJaSb9WkaVyhdeRCHugmH+f8Qz5m8pBDm5zMRgc
+TOUzUhrC3aYqfm3nuCcReB3yn1LpyKe5oGzUBvrDAtME7XM87mc4w3tJRCnp8HX7
+IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
+9hnnNk0rP0HZsyJNtCXezQxMoznT2V9XmkuNr1rKfgSNaSTQ6MW/wQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..1110db41
--- /dev/null
+++ b/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-26.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO4hpA262RckfWkz2d90dqhIXmMrC9dGS+Sc0uABbWIOGUmAgGK8NA95N0fs1aIeRQm4lq3uI/TtVpyJL6y7kJkCAwEAAaN/MH0wHQYDVR0OBBYEFBX5OAmlsWbotOOwEjLCZh/04ziIME4GA1UdIwRHMEWAFBX5OAmlsWbotOOwEjLCZh/04ziIoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAmuMWw/ZSWkQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUXiG3pdRurQu+NHg5belX8wMno8A+TUEkxvENQYK5H0+OApYPJYXyO/KX4oEnpZSGwC0A+B40agW+OkwQEgOk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/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://nya-26.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO4hpA262RckfWkz2d90dqhIXmMrC9dGS+Sc0uABbWIOGUmAgGK8NA95N0fs1aIeRQm4lq3uI/TtVpyJL6y7kJkCAwEAAaN/MH0wHQYDVR0OBBYEFBX5OAmlsWbotOOwEjLCZh/04ziIME4GA1UdIwRHMEWAFBX5OAmlsWbotOOwEjLCZh/04ziIoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAmuMWw/ZSWkQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUXiG3pdRurQu+NHg5belX8wMno8A+TUEkxvENQYK5H0+OApYPJYXyO/KX4oEnpZSGwC0A+B40agW+OkwQEgOk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/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-1.0/nya-26.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..39019f4a
--- /dev/null
+++ b/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-26.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANPMHs+BB/iEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3
+MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDedjUfQw5R3giUe3QQtdOcPm7nPSQh0
+OmMCaLEyjBhPx48lnT5MK+2zVeUK8L82C+MKkGYTjO2JP7uk0VfIlms1LgdmkNK7
+M6Qfyd2C9JJJK+xNoejf/hreMZ0/KU47x5UlS502tFzuXSnau/07GwEzbjX6qWMc
+o1PExvlVaL12308w3RqtnOXo9Gv6vPvUmb6/GwIr6ASC1IGXE3FSBAZc32IJGHcO
+BG5EuM61UpPd5j/emZVgDN0+GaUDT8cm7NiqWYfacPyay1+ddnsNX+viYtAPeWzR
+QxwYQe662E1OEKAmyvGf2+YZF1aShseIJcyZFVx4fnQ/MAhRD5CdHwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRxs9AFvhAkl0y6Oi2rUERQ
+PE+JTjANBgkqhkiG9w0BAQUFAAOCAQEAYYKQmoM4/5D1f9jQTGBF+bvxFKLsL//F
+ZnsxU3m2QQhXE/So/i6bSo0hW6OOndllcM4QZg5ElhgS7UxUd2cUtIDq3k1AtPqM
+MC4bAHUU87jb3wJ1jUkGEGSdj0W4ZrG3N0D0TOzEXFu8oIM9cDJg43nN9DfznTHT
+7/3BYhHHxboTA/ZmXtRKnAmSTeeRmd8r6soxgGjLOCn53XqF+7P89jjgUzrrq0kB
+yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
+90YPkBD99DRXnjFWk9l30fyTCYcxuofuoOj5u8/VWIXvgoi75dmgiw==
+</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>https://nya-26.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANPMHs+BB/iEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3
+MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDedjUfQw5R3giUe3QQtdOcPm7nPSQh0
+OmMCaLEyjBhPx48lnT5MK+2zVeUK8L82C+MKkGYTjO2JP7uk0VfIlms1LgdmkNK7
+M6Qfyd2C9JJJK+xNoejf/hreMZ0/KU47x5UlS502tFzuXSnau/07GwEzbjX6qWMc
+o1PExvlVaL12308w3RqtnOXo9Gv6vPvUmb6/GwIr6ASC1IGXE3FSBAZc32IJGHcO
+BG5EuM61UpPd5j/emZVgDN0+GaUDT8cm7NiqWYfacPyay1+ddnsNX+viYtAPeWzR
+QxwYQe662E1OEKAmyvGf2+YZF1aShseIJcyZFVx4fnQ/MAhRD5CdHwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRxs9AFvhAkl0y6Oi2rUERQ
+PE+JTjANBgkqhkiG9w0BAQUFAAOCAQEAYYKQmoM4/5D1f9jQTGBF+bvxFKLsL//F
+ZnsxU3m2QQhXE/So/i6bSo0hW6OOndllcM4QZg5ElhgS7UxUd2cUtIDq3k1AtPqM
+MC4bAHUU87jb3wJ1jUkGEGSdj0W4ZrG3N0D0TOzEXFu8oIM9cDJg43nN9DfznTHT
+7/3BYhHHxboTA/ZmXtRKnAmSTeeRmd8r6soxgGjLOCn53XqF+7P89jjgUzrrq0kB
+yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
+90YPkBD99DRXnjFWk9l30fyTCYcxuofuoOj5u8/VWIXvgoi75dmgiw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..18fc1cd0
--- /dev/null
+++ b/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-26.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ3WhcNMjEwMjI3MTYyODQ3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8VHy0CbGSb2QnE26Ztpkb8ZDnM9VlWC3vblii0+WsA8YGG8go2T3lk6qIizBiGE0SGykUskuujUeRsN0iMvN0CAwEAAaN/MH0wHQYDVR0OBBYEFOFFdextZDqDy1Pg0ivtW273SypqME4GA1UdIwRHMEWAFOFFdextZDqDy1Pg0ivtW273SypqoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAzht7NXYim7MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA2jhEZ51yTjR5IXOgAI4Gyi6Mp58wd0aBLOCYtCiuCYPkt1YkkjHmDypBS59gwhsKsCuBFhwv9bOHEvtiNQ37g=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/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://nya-26.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ3WhcNMjEwMjI3MTYyODQ3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8VHy0CbGSb2QnE26Ztpkb8ZDnM9VlWC3vblii0+WsA8YGG8go2T3lk6qIizBiGE0SGykUskuujUeRsN0iMvN0CAwEAAaN/MH0wHQYDVR0OBBYEFOFFdextZDqDy1Pg0ivtW273SypqME4GA1UdIwRHMEWAFOFFdextZDqDy1Pg0ivtW273SypqoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAzht7NXYim7MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA2jhEZ51yTjR5IXOgAI4Gyi6Mp58wd0aBLOCYtCiuCYPkt1YkkjHmDypBS59gwhsKsCuBFhwv9bOHEvtiNQ37g=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/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-1.0/nya-27.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..4faa0a55
--- /dev/null
+++ b/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-27.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALHFla5Pd3q9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ4WhcNMjEwMjI3
+MTYyODQ4WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxehiiW8zzkPYD7YT7KeX1Wj2nQSzEWg
+AqgnRe9AhCXFPrc6xqAo6VSiynSxT6XW7wGqxHwBrrgSFc9jy3QnfIEasPawPqdm
+VfYHAPTQLN1B+5M/i14AauoTphlVeAOi0z7uv8dMoNTRuuUvblUuUb+J+hiTrgwn
+oD29FJAWS3vzEyjDWr4JyXuhJbsZSbL5NDlE9XbTfQ0+j98BUayd1gyyQkotBReT
+WKGmqcoCPrboM1wibxb4jWURP6+UR9nE75Ul3Z7fiAs9b5QVFAdTq+FcraL0Ixjt
+R5uNGBnr3pKnuhZLXPvOSDAFYtHJcNMi5W1zE8r54rJOSIt5JR6LUQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQRQsg7ssya95IY2+UIfzen
+HkT2EzANBgkqhkiG9w0BAQUFAAOCAQEAknvLf7/nlFjkiKP3BTTxveI02q6LmbHz
+h/6+eh1kEUMixYXplWaZ75pllOjocVEaPLksaHUAt+8oOIp0XurncdD6ZhjKyQBc
+49JpvdW1HFvw39L0omp2GIbcchtWPJR59bFUT7ej4H2/0Xay0bQ34QyJwK3Y4btf
+JAlDMUQIK98uWVL31UcmB5jasWzPLfhaj5xD7mJlMPVuAIeenvtKtPGUFaKMsUO9
+QIDhp5uY4xIwTrVw4Hao1lkAIKeJcELSoEfiyPAYaukbM+NqXrscO1ggwlUi7wi3
+UMYlJQdprstMpBqDZw7DmjrPz62SbdnakbXUfAg0x6uOXlVtcv0iOQ==
+</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>https://nya-27.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALHFla5Pd3q9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ4WhcNMjEwMjI3
+MTYyODQ4WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxehiiW8zzkPYD7YT7KeX1Wj2nQSzEWg
+AqgnRe9AhCXFPrc6xqAo6VSiynSxT6XW7wGqxHwBrrgSFc9jy3QnfIEasPawPqdm
+VfYHAPTQLN1B+5M/i14AauoTphlVeAOi0z7uv8dMoNTRuuUvblUuUb+J+hiTrgwn
+oD29FJAWS3vzEyjDWr4JyXuhJbsZSbL5NDlE9XbTfQ0+j98BUayd1gyyQkotBReT
+WKGmqcoCPrboM1wibxb4jWURP6+UR9nE75Ul3Z7fiAs9b5QVFAdTq+FcraL0Ixjt
+R5uNGBnr3pKnuhZLXPvOSDAFYtHJcNMi5W1zE8r54rJOSIt5JR6LUQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQRQsg7ssya95IY2+UIfzen
+HkT2EzANBgkqhkiG9w0BAQUFAAOCAQEAknvLf7/nlFjkiKP3BTTxveI02q6LmbHz
+h/6+eh1kEUMixYXplWaZ75pllOjocVEaPLksaHUAt+8oOIp0XurncdD6ZhjKyQBc
+49JpvdW1HFvw39L0omp2GIbcchtWPJR59bFUT7ej4H2/0Xay0bQ34QyJwK3Y4btf
+JAlDMUQIK98uWVL31UcmB5jasWzPLfhaj5xD7mJlMPVuAIeenvtKtPGUFaKMsUO9
+QIDhp5uY4xIwTrVw4Hao1lkAIKeJcELSoEfiyPAYaukbM+NqXrscO1ggwlUi7wi3
+UMYlJQdprstMpBqDZw7DmjrPz62SbdnakbXUfAg0x6uOXlVtcv0iOQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..bd3f4320
--- /dev/null
+++ b/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-27.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQZjG87MJxX/u39xd3ntIf+Kbw1HnwedEQtrEXBGvY+QUxrVvb9lU3NwXJg68NyjyLAZUozZ/ctRGe59Ao6Y6kCAwEAAaN/MH0wHQYDVR0OBBYEFHK1spBTknKBFa1BEnuP/vAFJBHcME4GA1UdIwRHMEWAFHK1spBTknKBFa1BEnuP/vAFJBHcoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkA1gjtfLhvs6IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC/cJyvjSAZAQwq9XhuR8oEH2EzFJJUxAtXhG99q7tS5TzaPWduAcoeLDpz7LUP1BcsfbyM8C3eVLNAUPtNF5eU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/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://nya-27.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQZjG87MJxX/u39xd3ntIf+Kbw1HnwedEQtrEXBGvY+QUxrVvb9lU3NwXJg68NyjyLAZUozZ/ctRGe59Ao6Y6kCAwEAAaN/MH0wHQYDVR0OBBYEFHK1spBTknKBFa1BEnuP/vAFJBHcME4GA1UdIwRHMEWAFHK1spBTknKBFa1BEnuP/vAFJBHcoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkA1gjtfLhvs6IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC/cJyvjSAZAQwq9XhuR8oEH2EzFJJUxAtXhG99q7tS5TzaPWduAcoeLDpz7LUP1BcsfbyM8C3eVLNAUPtNF5eU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/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-1.0/nya-27.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..4e3ca013
--- /dev/null
+++ b/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-27.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIb7sNmCeZ9HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ5WhcNMjEwMjI3
+MTYyODQ5WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqaix7VzfErBfxZvClLBK3uWZaZz1gkb5
+yLvFfDIfIJR1ms4SqCt7aZ78bDK2XKrQOyZXz2I9jrdZxpp4MkOLGCVp3UFlqOEJ
+mjapDGiF+jyMCsBymxXqns849PD37WofXoyP7rLZBHoI5WtULoQa1z9JDxMYdtXZ
+2yrzN2lsvoc3GsN83SG221xeEydbABTejWuxq9PqIyOsX8dYQ4ZP+I8l240rzDXu
+Mf0fw/ZqzieS0tekoVpW4OjbQK59e78ISOio7FhBwe0nabwAQzqGJp8TMuX2ATjd
+bv1fkUXcVoHmaO1DQfOS6sKrw0Yj/bVPs6+FOopQhRJWDEb7VZCJ4wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRTJ5TokjcggHqTRb8jVrma
+2qeHMzANBgkqhkiG9w0BAQUFAAOCAQEAfboJ6PyjaCG3TBr/sA7MLX8J8TY6kYzp
+KFb+lS9T9MRr41DwinZAIUsYqqLmH9tB0Jo5h6RGbGrHMvPqoAZBW/IXIAVSd9p3
+Ak5rNtRr35weTIes0fN691W6YjQAESapQ6Du2l6ijMvNlNTLQbXiZE+bKzzJtvcB
+t8gnaRgtnv6iicShmpgkS/KuIR+ATXZjyxAQBWZnlrz4jT1/ueBrdqAwdpfosWTu
+utY5wItm3TQJRshv2a82m7ftAbviuB6cxTo/1RGQPQ/hb4Es8I+LqWR5TSnyfX8e
+MhVUSmaP3/KoWvbJ1UJ/pPl9RGufT50br0mnYMGI+bjUX2c8JJbzlg==
+</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>https://nya-27.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIb7sNmCeZ9HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ5WhcNMjEwMjI3
+MTYyODQ5WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqaix7VzfErBfxZvClLBK3uWZaZz1gkb5
+yLvFfDIfIJR1ms4SqCt7aZ78bDK2XKrQOyZXz2I9jrdZxpp4MkOLGCVp3UFlqOEJ
+mjapDGiF+jyMCsBymxXqns849PD37WofXoyP7rLZBHoI5WtULoQa1z9JDxMYdtXZ
+2yrzN2lsvoc3GsN83SG221xeEydbABTejWuxq9PqIyOsX8dYQ4ZP+I8l240rzDXu
+Mf0fw/ZqzieS0tekoVpW4OjbQK59e78ISOio7FhBwe0nabwAQzqGJp8TMuX2ATjd
+bv1fkUXcVoHmaO1DQfOS6sKrw0Yj/bVPs6+FOopQhRJWDEb7VZCJ4wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRTJ5TokjcggHqTRb8jVrma
+2qeHMzANBgkqhkiG9w0BAQUFAAOCAQEAfboJ6PyjaCG3TBr/sA7MLX8J8TY6kYzp
+KFb+lS9T9MRr41DwinZAIUsYqqLmH9tB0Jo5h6RGbGrHMvPqoAZBW/IXIAVSd9p3
+Ak5rNtRr35weTIes0fN691W6YjQAESapQ6Du2l6ijMvNlNTLQbXiZE+bKzzJtvcB
+t8gnaRgtnv6iicShmpgkS/KuIR+ATXZjyxAQBWZnlrz4jT1/ueBrdqAwdpfosWTu
+utY5wItm3TQJRshv2a82m7ftAbviuB6cxTo/1RGQPQ/hb4Es8I+LqWR5TSnyfX8e
+MhVUSmaP3/KoWvbJ1UJ/pPl9RGufT50br0mnYMGI+bjUX2c8JJbzlg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..2d89e9ed
--- /dev/null
+++ b/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-27.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANGJ01J22ZKMxFpcn8AxCnvIOA1BRt+usGNqXf9Z5KkndgpcfeHtIx+njay2nQ7Kc3v7+lxnj4OVq3sjgAFNNDUCAwEAAaN/MH0wHQYDVR0OBBYEFHYKFgvxlwh1LE8qbeU4n6mO+54OME4GA1UdIwRHMEWAFHYKFgvxlwh1LE8qbeU4n6mO+54OoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAvncyDC5Ud5UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJiWafcW56v6YB4nVrYA7l7W9z3oQVriCrleQVeRPZeBJf5niFe9Mwa/2R/zv5C4NebIQN7Pb6oLR15qCfe3tvU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/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://nya-27.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANGJ01J22ZKMxFpcn8AxCnvIOA1BRt+usGNqXf9Z5KkndgpcfeHtIx+njay2nQ7Kc3v7+lxnj4OVq3sjgAFNNDUCAwEAAaN/MH0wHQYDVR0OBBYEFHYKFgvxlwh1LE8qbeU4n6mO+54OME4GA1UdIwRHMEWAFHYKFgvxlwh1LE8qbeU4n6mO+54OoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAvncyDC5Ud5UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJiWafcW56v6YB4nVrYA7l7W9z3oQVriCrleQVeRPZeBJf5niFe9Mwa/2R/zv5C4NebIQN7Pb6oLR15qCfe3tvU=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/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-1.0/nya-28.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..cc19f47f
--- /dev/null
+++ b/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-28.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANukgTJ/UqfnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUxWhcNMjEwMjI3
+MTYyODUxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2q7hl8tp4XMHOkh+SDalGBhbnasx5Mr/
+MSdOcvaJ2W6G+ipRD380xWc5+0k+ZGg8tG3PxwRJ78z+TYxwaxcNTsMSGulkQc9Q
+HQWE4xpF3p8GxY9DZPpV0VM+saCk0WfxGB5G/StzTdWisPJ1U4iToB8L1yc8m3/U
+Cs0oMBVisvr4oydXsh5FloDFic/vH9XCCulCyKn9dRoJK0MtbspGs4IYOKkxwLA3
+yf/A0OroWURqw1P3n7IIgC9blG/du9u33AZliYa7WkNYZWE7RUL1KVne58qMoCyd
+ITnUAb2MUueDQzBjj4xao8EgH/UOcLTcJAraKqtxHnZgQkGuPDme3QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQHe+vF9fqOJ4qdjHO5BPsU
+SipYDzANBgkqhkiG9w0BAQUFAAOCAQEAcZac+RHR1Z6XmQwyrSwC+FkZc/CtZbee
+2ToeJn9s7+DoltZBCw2ffMyYdIj4rVxOrLEwrWuTvNttL+z1tDrfyKZMHqu9FOL4
+urWdsYhThw+5D+CyR+9DD3I4PYn95yJgF933jGM+yD2/2z8paN8hlvE+uAYFvBjo
+zzQvIS/cX4YzUmLIRSZs+jx6zK75DuELMKy1tE2Muhck0GB2g2MO/3uL4xrAiNAu
+l26jHRksp7Q5PZWohHAuLyYxLwc9L7+hi8N7aUWF4WxIHxCOENU/8hKQn+ntr9h5
+lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
+</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>https://nya-28.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANukgTJ/UqfnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUxWhcNMjEwMjI3
+MTYyODUxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2q7hl8tp4XMHOkh+SDalGBhbnasx5Mr/
+MSdOcvaJ2W6G+ipRD380xWc5+0k+ZGg8tG3PxwRJ78z+TYxwaxcNTsMSGulkQc9Q
+HQWE4xpF3p8GxY9DZPpV0VM+saCk0WfxGB5G/StzTdWisPJ1U4iToB8L1yc8m3/U
+Cs0oMBVisvr4oydXsh5FloDFic/vH9XCCulCyKn9dRoJK0MtbspGs4IYOKkxwLA3
+yf/A0OroWURqw1P3n7IIgC9blG/du9u33AZliYa7WkNYZWE7RUL1KVne58qMoCyd
+ITnUAb2MUueDQzBjj4xao8EgH/UOcLTcJAraKqtxHnZgQkGuPDme3QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQHe+vF9fqOJ4qdjHO5BPsU
+SipYDzANBgkqhkiG9w0BAQUFAAOCAQEAcZac+RHR1Z6XmQwyrSwC+FkZc/CtZbee
+2ToeJn9s7+DoltZBCw2ffMyYdIj4rVxOrLEwrWuTvNttL+z1tDrfyKZMHqu9FOL4
+urWdsYhThw+5D+CyR+9DD3I4PYn95yJgF933jGM+yD2/2z8paN8hlvE+uAYFvBjo
+zzQvIS/cX4YzUmLIRSZs+jx6zK75DuELMKy1tE2Muhck0GB2g2MO/3uL4xrAiNAu
+l26jHRksp7Q5PZWohHAuLyYxLwc9L7+hi8N7aUWF4WxIHxCOENU/8hKQn+ntr9h5
+lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..ae206f68
--- /dev/null
+++ b/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-28.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK/Wxf7Jo4FhF1A/yIRPnLUoLHXMWFGO+4Zo6kreju+oJUwb86eoc/NvnRrmWdsvqmBxHVTssm6FxyhIIymx3fcCAwEAAaN/MH0wHQYDVR0OBBYEFA5ZAM53TrIy2YNBE8kg9ndGMOy4ME4GA1UdIwRHMEWAFA5ZAM53TrIy2YNBE8kg9ndGMOy4oSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAlHUOerMJlZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKCzFqiX53XaIapQhZS5xMzsaiIZJf4NzNL7/4i6WdFKnCYtpTYR/lQZwyked8IDO5IEggUulHXrPAMKcE270/E=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/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://nya-28.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK/Wxf7Jo4FhF1A/yIRPnLUoLHXMWFGO+4Zo6kreju+oJUwb86eoc/NvnRrmWdsvqmBxHVTssm6FxyhIIymx3fcCAwEAAaN/MH0wHQYDVR0OBBYEFA5ZAM53TrIy2YNBE8kg9ndGMOy4ME4GA1UdIwRHMEWAFA5ZAM53TrIy2YNBE8kg9ndGMOy4oSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAlHUOerMJlZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKCzFqiX53XaIapQhZS5xMzsaiIZJf4NzNL7/4i6WdFKnCYtpTYR/lQZwyked8IDO5IEggUulHXrPAMKcE270/E=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/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-1.0/nya-28.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..bee03ff2
--- /dev/null
+++ b/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-28.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO2pKnOJFYrHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3
+MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Zw/7BzwuIvK9LFXB/pKaEqmjZJHqUVv
+3FVAQivqoc4MkNBwY9vs60x5wjozrDFkzIBKmCv6I2pOCSJe06vy8SQRtpnRFNxC
+r13x5TjUDAbjkuXlHqqq43XU2X2HjzsiICc12FDv86lvhwGt3o9FPMhAWCWq8o2N
+hq+CiH/tYQZUJONudLSzdKpCd5KyzIeCN1pVvCbGxPiLbC74TFjqRUL2yHz9j5c1
+m6vD1wtXXWbmoy2J1i8zzoISfsMx6+JAxD0ml09INQTrJBR2fXBz6SDg2fy8JDkv
+pBB3H2edt2fZdneuKjRR2s/Z+QqdyNkX0iGNub2+CG/GfVybEEhoRQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQgEG3hxDthM6mVfMZQCRRw
+ZeZT0jANBgkqhkiG9w0BAQUFAAOCAQEAEq2OzV7g5BiF+oCnVvKmkfUnsIoj6mMD
+1ErkER/a/s1VozCXv5Q4P9oe336SDbstxac2vLLzEaq7/ZPAZuYEeT1BNmlNV6KY
+8e1i5QPEZge9LDZG3FpLGUh+yYJFAA2ITAr1jk1a3zPrAfmUpB3lrhBeoo73YaCb
+veggeeEPTPhxQpUyh2WBgQVn//91VQw0LEUvLQfm5Mp3PMXIwV+x06zgXo5+MaeK
+9Bo0py2m6TkKyxkB6ShU+MKbsxiyhVlF18cZIgBIbvS7aTq72QIaPz/c5FBCwPpD
+J/MEsrZ/KnERkfVq1Z6YyIU90KZCe496B5df6e70129rDGb1ZoMmDQ==
+</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>https://nya-28.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO2pKnOJFYrHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3
+MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Zw/7BzwuIvK9LFXB/pKaEqmjZJHqUVv
+3FVAQivqoc4MkNBwY9vs60x5wjozrDFkzIBKmCv6I2pOCSJe06vy8SQRtpnRFNxC
+r13x5TjUDAbjkuXlHqqq43XU2X2HjzsiICc12FDv86lvhwGt3o9FPMhAWCWq8o2N
+hq+CiH/tYQZUJONudLSzdKpCd5KyzIeCN1pVvCbGxPiLbC74TFjqRUL2yHz9j5c1
+m6vD1wtXXWbmoy2J1i8zzoISfsMx6+JAxD0ml09INQTrJBR2fXBz6SDg2fy8JDkv
+pBB3H2edt2fZdneuKjRR2s/Z+QqdyNkX0iGNub2+CG/GfVybEEhoRQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQgEG3hxDthM6mVfMZQCRRw
+ZeZT0jANBgkqhkiG9w0BAQUFAAOCAQEAEq2OzV7g5BiF+oCnVvKmkfUnsIoj6mMD
+1ErkER/a/s1VozCXv5Q4P9oe336SDbstxac2vLLzEaq7/ZPAZuYEeT1BNmlNV6KY
+8e1i5QPEZge9LDZG3FpLGUh+yYJFAA2ITAr1jk1a3zPrAfmUpB3lrhBeoo73YaCb
+veggeeEPTPhxQpUyh2WBgQVn//91VQw0LEUvLQfm5Mp3PMXIwV+x06zgXo5+MaeK
+9Bo0py2m6TkKyxkB6ShU+MKbsxiyhVlF18cZIgBIbvS7aTq72QIaPz/c5FBCwPpD
+J/MEsrZ/KnERkfVq1Z6YyIU90KZCe496B5df6e70129rDGb1ZoMmDQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..b5119e3b
--- /dev/null
+++ b/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-28.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU0WhcNMjEwMjI3MTYyODU0WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXP4usOfBZt3SjtplXarM3x3XKkls8GIEF6sAVfA8qbir3VaMm5H9zG+VF+Rk71C8rcAGdEWZWCKxaNf2tHTVUCAwEAAaN/MH0wHQYDVR0OBBYEFHdZbjHYDhYiKgRAt0Lolt0EqldiME4GA1UdIwRHMEWAFHdZbjHYDhYiKgRAt0Lolt0EqldioSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAsbwYJtspHe0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAATAH/DLKWu6OcYR1Ab/VtOAiKOqq1CGTVsmZ7sGNWIhtd0KuSnvSplWz2WYOXqtWoUjmSzBnxRFwTLKwjbZBic=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/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://nya-28.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU0WhcNMjEwMjI3MTYyODU0WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXP4usOfBZt3SjtplXarM3x3XKkls8GIEF6sAVfA8qbir3VaMm5H9zG+VF+Rk71C8rcAGdEWZWCKxaNf2tHTVUCAwEAAaN/MH0wHQYDVR0OBBYEFHdZbjHYDhYiKgRAt0Lolt0EqldiME4GA1UdIwRHMEWAFHdZbjHYDhYiKgRAt0Lolt0EqldioSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAsbwYJtspHe0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAATAH/DLKWu6OcYR1Ab/VtOAiKOqq1CGTVsmZ7sGNWIhtd0KuSnvSplWz2WYOXqtWoUjmSzBnxRFwTLKwjbZBic=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/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-1.0/nya-29.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..430c908c
--- /dev/null
+++ b/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-29.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM8GWsqcmzmxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU1WhcNMjEwMjI3
+MTYyODU1WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwGRXduq0Jt5J1m/zZpgW5c5Vhob7THbm
+pjcfLvFRNLSTXvNbJykI+3KtjIuQVscrJyc+dt4469XBJtJ2wFulYBYTgF4u3Y/S
+cJOjKZDtejAQf8B80/LGk9YlPWKqI8NF/QrNeKRayOR3tiWGO0pBEpwxV/ZXqe30
+G7lQh3fmxayHT36LmVP9zP9f/Esum1SF5s9FU4PilZ4XrJFvVh2hEbWOrydx94CC
+tb7pMQ9tvkZIa27Zq6IhvwJYI7WfEy0mCboV4FoAIFbKJ6pb3kEQsXCi3MaNqPo2
+pK7k39G2WPsydkpj2b4Z7oIqh5lKEaoXmIU2j5yJTKYzZqWbJXkxdQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRR1vszNdIXOOwKd5/CKxxW
+rUrm2DANBgkqhkiG9w0BAQUFAAOCAQEAbmA2M+PkT8PKaqThlrNpL+SsQldxRtsn
+bYGldjtuW0+xf90IB6GLsth/FitjDiyh27ItaJinK7po2jS+jKlz9k2YcL1kztKE
+GO7CjhBwuJnv5/HVotzjvdBroObNAuBvG7OhfVLFoucp2Gxwx4LKFFHgtCZckBK0
+eK6ZWCXWUB+hOFq+w8rwRjZILyd2oLrlR/6/6mbCz8SCZV7v1uZgV4iinl8U83cZ
+PWt1xwPpiSPpHOPBHYOHbQN/cgG+RYFZggn9/9U3bg8EE2xZBuQ6cgifp/QKOPn0
+WSAr3hODRncOjSgwOPKYRYaEZeAmgmG22vRFZuPCz/rdEjRGMwPcMw==
+</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>https://nya-29.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM8GWsqcmzmxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU1WhcNMjEwMjI3
+MTYyODU1WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwGRXduq0Jt5J1m/zZpgW5c5Vhob7THbm
+pjcfLvFRNLSTXvNbJykI+3KtjIuQVscrJyc+dt4469XBJtJ2wFulYBYTgF4u3Y/S
+cJOjKZDtejAQf8B80/LGk9YlPWKqI8NF/QrNeKRayOR3tiWGO0pBEpwxV/ZXqe30
+G7lQh3fmxayHT36LmVP9zP9f/Esum1SF5s9FU4PilZ4XrJFvVh2hEbWOrydx94CC
+tb7pMQ9tvkZIa27Zq6IhvwJYI7WfEy0mCboV4FoAIFbKJ6pb3kEQsXCi3MaNqPo2
+pK7k39G2WPsydkpj2b4Z7oIqh5lKEaoXmIU2j5yJTKYzZqWbJXkxdQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRR1vszNdIXOOwKd5/CKxxW
+rUrm2DANBgkqhkiG9w0BAQUFAAOCAQEAbmA2M+PkT8PKaqThlrNpL+SsQldxRtsn
+bYGldjtuW0+xf90IB6GLsth/FitjDiyh27ItaJinK7po2jS+jKlz9k2YcL1kztKE
+GO7CjhBwuJnv5/HVotzjvdBroObNAuBvG7OhfVLFoucp2Gxwx4LKFFHgtCZckBK0
+eK6ZWCXWUB+hOFq+w8rwRjZILyd2oLrlR/6/6mbCz8SCZV7v1uZgV4iinl8U83cZ
+PWt1xwPpiSPpHOPBHYOHbQN/cgG+RYFZggn9/9U3bg8EE2xZBuQ6cgifp/QKOPn0
+WSAr3hODRncOjSgwOPKYRYaEZeAmgmG22vRFZuPCz/rdEjRGMwPcMw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..d5c72b2c
--- /dev/null
+++ b/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-29.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANf4fWbt3EosFuu/5SM5xJDiAcwSPMLWy0harbjZhN++OlZm0u+iGtzeYn13dBHeZ+NkTHuii1mFzNy+NIqY18cCAwEAAaN/MH0wHQYDVR0OBBYEFI1CppVf49AQoQenMNq2u8NqfAGIME4GA1UdIwRHMEWAFI1CppVf49AQoQenMNq2u8NqfAGIoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkA5aGzRlyW/bEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM4l+PQsxKxx9BymFE0Ft18FfhqDRm+bWaHwQdpbgufANubggkhnHn41ri39OF9XaFVoNWGXUGMfCsXrY2stwrk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/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://nya-29.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANf4fWbt3EosFuu/5SM5xJDiAcwSPMLWy0harbjZhN++OlZm0u+iGtzeYn13dBHeZ+NkTHuii1mFzNy+NIqY18cCAwEAAaN/MH0wHQYDVR0OBBYEFI1CppVf49AQoQenMNq2u8NqfAGIME4GA1UdIwRHMEWAFI1CppVf49AQoQenMNq2u8NqfAGIoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkA5aGzRlyW/bEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM4l+PQsxKxx9BymFE0Ft18FfhqDRm+bWaHwQdpbgufANubggkhnHn41ri39OF9XaFVoNWGXUGMfCsXrY2stwrk=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/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-1.0/nya-29.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..5704cca5
--- /dev/null
+++ b/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-29.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANydui5JvJh8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU2WhcNMjEwMjI3
+MTYyODU2WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4pAggFJoG223o0gxSaKrDKaHoTebMFQl
+vBdYo6ZqwKFhaUujf1nJETcZZE0OVfx78Rmz6DN1uDSR9DkrW8DVTHt92T/UId64
+eCdGHo5aDMCNa+Gose5XmrcIQVbEZvsIDITjcfzBh/6VbnXRwimIY8h5uc8BNMp1
+iIeXj0gtF0JghYxvNw8t8QOO6eA5vvxegBYrnNJ2aMLKUP0U0APl/z21eU+FIpzH
+CRD15d55zSDhxGPF1M4NaQbIDkbu5SmBunZR+ZtcsD/FVsSrlBIvcBI6bu6UMR8p
+Rl1/EARosVfIwtm5PxcOWPEhBcCzBrlcMcPjl/FTFEqxY1B0o5rCNwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRiMLuDvoIYGyj8wlY4v1U8
+10auqjANBgkqhkiG9w0BAQUFAAOCAQEAsT13yBovis5OyG3XJ9MVSodU9ykXVj7U
+y6gRSIKu3nGhMLcaqz7HzXCfLdsS2KrOdXTSNseg84u4CNRXh2Zz2ki4ulCyWHk4
+SZCr8VN31QCiSpBnQPsasc6ZuC96Srnw+sgi/GyJdkfhZvGn8wzSnaXRwYSZyIF3
+Jay0US/IB+8h3pCRmArHoUPFjrT8ptpMBANca5dLjwKtcvBxTBvNX0l2Ypf6Goe8
+wAQ8fjs2p5rE+rkYvhSOefY27YcMcpYZtwsdpL9n1Azi2LAQOrmz+shNM059CgYb
+dPtbgXk/a3zwik/8RzmXndxF4O3D6ei/JpVhjCUj3fCXWjZzWq+4PQ==
+</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>https://nya-29.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANydui5JvJh8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU2WhcNMjEwMjI3
+MTYyODU2WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4pAggFJoG223o0gxSaKrDKaHoTebMFQl
+vBdYo6ZqwKFhaUujf1nJETcZZE0OVfx78Rmz6DN1uDSR9DkrW8DVTHt92T/UId64
+eCdGHo5aDMCNa+Gose5XmrcIQVbEZvsIDITjcfzBh/6VbnXRwimIY8h5uc8BNMp1
+iIeXj0gtF0JghYxvNw8t8QOO6eA5vvxegBYrnNJ2aMLKUP0U0APl/z21eU+FIpzH
+CRD15d55zSDhxGPF1M4NaQbIDkbu5SmBunZR+ZtcsD/FVsSrlBIvcBI6bu6UMR8p
+Rl1/EARosVfIwtm5PxcOWPEhBcCzBrlcMcPjl/FTFEqxY1B0o5rCNwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRiMLuDvoIYGyj8wlY4v1U8
+10auqjANBgkqhkiG9w0BAQUFAAOCAQEAsT13yBovis5OyG3XJ9MVSodU9ykXVj7U
+y6gRSIKu3nGhMLcaqz7HzXCfLdsS2KrOdXTSNseg84u4CNRXh2Zz2ki4ulCyWHk4
+SZCr8VN31QCiSpBnQPsasc6ZuC96Srnw+sgi/GyJdkfhZvGn8wzSnaXRwYSZyIF3
+Jay0US/IB+8h3pCRmArHoUPFjrT8ptpMBANca5dLjwKtcvBxTBvNX0l2Ypf6Goe8
+wAQ8fjs2p5rE+rkYvhSOefY27YcMcpYZtwsdpL9n1Azi2LAQOrmz+shNM059CgYb
+dPtbgXk/a3zwik/8RzmXndxF4O3D6ei/JpVhjCUj3fCXWjZzWq+4PQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..c5da2ab8
--- /dev/null
+++ b/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-29.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOzGfJ60TVWonxdzQ/0w8+Ej/GSK303yN/+COVEjHEW8HGO5XwrFIEHooGL++vbkRIa9zLcmuosZHh5qrmY8Ne0CAwEAAaN/MH0wHQYDVR0OBBYEFPl1wdmk4P+yu/723gUvIYSdE70tME4GA1UdIwRHMEWAFPl1wdmk4P+yu/723gUvIYSdE70toSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAz9D6Gsx7hEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIY0hfnUmZDxqR0JllYFQfACT+sx6y7QLDaukGVvvAdSvVJbCk9mJpLaWaIDTB4AfTk1Q1alWVHOvepCbVyjvFc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/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://nya-29.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOzGfJ60TVWonxdzQ/0w8+Ej/GSK303yN/+COVEjHEW8HGO5XwrFIEHooGL++vbkRIa9zLcmuosZHh5qrmY8Ne0CAwEAAaN/MH0wHQYDVR0OBBYEFPl1wdmk4P+yu/723gUvIYSdE70tME4GA1UdIwRHMEWAFPl1wdmk4P+yu/723gUvIYSdE70toSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAz9D6Gsx7hEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIY0hfnUmZDxqR0JllYFQfACT+sx6y7QLDaukGVvvAdSvVJbCk9mJpLaWaIDTB4AfTk1Q1alWVHOvepCbVyjvFc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/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-1.0/nya-30.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..6b5cd246
--- /dev/null
+++ b/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/aws-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-30.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMNd1ScqbllRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU4WhcNMjEwMjI3
+MTYyODU4WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6KU+c+CoR3+SoFgRLl4CnkEa3/AqMdTn
+FkfJGSjf96dgwnffTmvv6EmLyrsOg8jkFM4/Mjz/9TO4z8RRqGJHTgJK8TGve/+n
+AhxVGdPvoUsynk2MclH7MhzPBHdkiYDdtyOJCwER6YXTirIvLNEyrZlWyFSPTNoE
+0xOWEd+4AuUbUC0xdS6H0A9VpYGF2DN0KgJFFiutJm+ud8Zm3gNAp6cV/maJEt3H
+YjbYtxLnDfJLzY6E4Qxf4ke1xz1VqhT1j7M/+NYb+zezS2dUtlLK4cvBO3bMyuwz
+FdapV7vv1tP+aXopA3ZaRsy5GcFY0zG7nAq1r4f3M0x4l2HErqjdawIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBT98XvKkDyfqY3JUHqVKD15
+coPVUTANBgkqhkiG9w0BAQUFAAOCAQEAaPoG+HDhkqRh2aJp9aR4jp5NRYDNH4Sx
+Qlon8dHQQ7a2HmaIXNOfylCCpj94JdBC1nh8V0RvDMmNwntKi+NgzBF2yX/5CQbQ
+gVNOVvoycPYWAd8PjRUsqZOgYngu3pqQ3f1ggHE3Ja3AtMQf/V2KiQGp9xgewqUG
+gyY2dgGyzEFQPty9GaB8GI98Vg2gN4V7vW/2GbUo+ygn5+AzaNKX6M3LCZ0Dzb0s
+Laj4dZXOB7DCaqioXTJ2jBets1VNaSlrKqbDzL613Qw85qAdegE+ArVUNGPDBP+e
+fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
+</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>https://nya-30.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMNd1ScqbllRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU4WhcNMjEwMjI3
+MTYyODU4WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6KU+c+CoR3+SoFgRLl4CnkEa3/AqMdTn
+FkfJGSjf96dgwnffTmvv6EmLyrsOg8jkFM4/Mjz/9TO4z8RRqGJHTgJK8TGve/+n
+AhxVGdPvoUsynk2MclH7MhzPBHdkiYDdtyOJCwER6YXTirIvLNEyrZlWyFSPTNoE
+0xOWEd+4AuUbUC0xdS6H0A9VpYGF2DN0KgJFFiutJm+ud8Zm3gNAp6cV/maJEt3H
+YjbYtxLnDfJLzY6E4Qxf4ke1xz1VqhT1j7M/+NYb+zezS2dUtlLK4cvBO3bMyuwz
+FdapV7vv1tP+aXopA3ZaRsy5GcFY0zG7nAq1r4f3M0x4l2HErqjdawIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBT98XvKkDyfqY3JUHqVKD15
+coPVUTANBgkqhkiG9w0BAQUFAAOCAQEAaPoG+HDhkqRh2aJp9aR4jp5NRYDNH4Sx
+Qlon8dHQQ7a2HmaIXNOfylCCpj94JdBC1nh8V0RvDMmNwntKi+NgzBF2yX/5CQbQ
+gVNOVvoycPYWAd8PjRUsqZOgYngu3pqQ3f1ggHE3Ja3AtMQf/V2KiQGp9xgewqUG
+gyY2dgGyzEFQPty9GaB8GI98Vg2gN4V7vW/2GbUo+ygn5+AzaNKX6M3LCZ0Dzb0s
+Laj4dZXOB7DCaqioXTJ2jBets1VNaSlrKqbDzL613Qw85qAdegE+ArVUNGPDBP+e
+fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..b44f99cb
--- /dev/null
+++ b/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-30.ladok.umu.se/dw-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM36igm4DOMivZpWFyIX9cJ758aVMIt5Gt1600sDxiy+jqdJqVxAn6q7l0hs7yeOuv5KudBqo9RPKqmm8m33tnsCAwEAAaN/MH0wHQYDVR0OBBYEFKGhyw2EmFJeU01IHvvDGun3/2H0ME4GA1UdIwRHMEWAFKGhyw2EmFJeU01IHvvDGun3/2H0oSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA4AK1cqBuj3AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGCKsGmCULIdk1GzIERKT0BBR+lL2eQ9qaxi5nx6Yfv1Xu8vjWCjgTCq3grNbaxkzybEfTpq2T5CJ25+07eDA0U=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/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://nya-30.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM36igm4DOMivZpWFyIX9cJ758aVMIt5Gt1600sDxiy+jqdJqVxAn6q7l0hs7yeOuv5KudBqo9RPKqmm8m33tnsCAwEAAaN/MH0wHQYDVR0OBBYEFKGhyw2EmFJeU01IHvvDGun3/2H0ME4GA1UdIwRHMEWAFKGhyw2EmFJeU01IHvvDGun3/2H0oSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA4AK1cqBuj3AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGCKsGmCULIdk1GzIERKT0BBR+lL2eQ9qaxi5nx6Yfv1Xu8vjWCjgTCq3grNbaxkzybEfTpq2T5CJ25+07eDA0U=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/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-1.0/nya-30.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..d87f883d
--- /dev/null
+++ b/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/ecs-sp">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-30.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL7Kj3icfbiQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU5WhcNMjEwMjI3
+MTYyODU5WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3j1wO/GY9r6TfmAFyityGo8mYN/AnAQT
+ESgVszEKhqKSaB+h2SWN2FyrpEE1RtAwJkUOJW2XF4G8ADV1hi7ojzZcooW3WIxR
++BE4BbzwyrOuMCWIcuSF8Tq0iped0pIRad36kW9ZtvGTzQwWQKTi90CxZ/7xhi9k
+NL3FDzdsMv1xK3oxrAuuATr/SDXf4RzlLDwEwR93r3MjwUs+nKeHJhtwKIwQEgRb
+Q/QdfWIh3Q9vSprGydLf/m8+Nf6ka2GREBtpqR0XNUILpx3M4SLnqJiY3VqejhtL
+wpaJz9BrJpD0qmzCi1mwf+19qqQbEmV9bTw+i9rxxQdW7QDjUou11QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQehqcy07TF2u1AZ266Rst/
+tDx/8jANBgkqhkiG9w0BAQUFAAOCAQEAI23vkHQC0Y/1QhiCjMKokj4lEWSL2p2p
+kU8wLpZhJQ/Y5QhXXJ/6LkxxME+yBhixr+45jYwNCbEWwjSbDRcTqAVgBn3SsKRb
+4jbxtCnfMl9n8Eya1QghH7v4xejkZRefU6mechmXhpaJZTpBpxGjCLZ0iQE0Vbwz
+iLwLCapfvHt1aTPoEmzADBxqfSH0E3pykxVvI6Bwcfg42+3Rgvo3xzH25L1WY+6R
+zzp+QuW8WcDmm2eBLLnDgFHG7Zh22MSr8hAo3Q8o3/C0D9iQg7VV36WZSkUM4keo
+eemU9AtLDw8r0Sd3K76LttVjQzUXSVN9jLvx7ahW2+mqbx3OWJFYfQ==
+</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>https://nya-30.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL7Kj3icfbiQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU5WhcNMjEwMjI3
+MTYyODU5WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3j1wO/GY9r6TfmAFyityGo8mYN/AnAQT
+ESgVszEKhqKSaB+h2SWN2FyrpEE1RtAwJkUOJW2XF4G8ADV1hi7ojzZcooW3WIxR
++BE4BbzwyrOuMCWIcuSF8Tq0iped0pIRad36kW9ZtvGTzQwWQKTi90CxZ/7xhi9k
+NL3FDzdsMv1xK3oxrAuuATr/SDXf4RzlLDwEwR93r3MjwUs+nKeHJhtwKIwQEgRb
+Q/QdfWIh3Q9vSprGydLf/m8+Nf6ka2GREBtpqR0XNUILpx3M4SLnqJiY3VqejhtL
+wpaJz9BrJpD0qmzCi1mwf+19qqQbEmV9bTw+i9rxxQdW7QDjUou11QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQehqcy07TF2u1AZ266Rst/
+tDx/8jANBgkqhkiG9w0BAQUFAAOCAQEAI23vkHQC0Y/1QhiCjMKokj4lEWSL2p2p
+kU8wLpZhJQ/Y5QhXXJ/6LkxxME+yBhixr+45jYwNCbEWwjSbDRcTqAVgBn3SsKRb
+4jbxtCnfMl9n8Eya1QghH7v4xejkZRefU6mechmXhpaJZTpBpxGjCLZ0iQE0Vbwz
+iLwLCapfvHt1aTPoEmzADBxqfSH0E3pykxVvI6Bwcfg42+3Rgvo3xzH25L1WY+6R
+zzp+QuW8WcDmm2eBLLnDgFHG7Zh22MSr8hAo3Q8o3/C0D9iQg7VV36WZSkUM4keo
+eemU9AtLDw8r0Sd3K76LttVjQzUXSVN9jLvx7ahW2+mqbx3OWJFYfQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..84af9079
--- /dev/null
+++ b/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-30.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJw37GcLrr0tqkrwK82PucThhXbMGny3b03QKRMC2NPxk9SFHo0cLFzG8WB9RaUbpy58yF7fLXn0XjD94IwogqsCAwEAAaN/MH0wHQYDVR0OBBYEFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtME4GA1UdIwRHMEWAFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkAiLkv4OzrUfswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABws5V3NQYoBnm6z6heIDrFWp59aLglcWMZPjzbKL7gNX8IetVL34mc+ESHm1ct//UXT0Ef0xGnPCgXSb3x6ixc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/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://nya-30.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJw37GcLrr0tqkrwK82PucThhXbMGny3b03QKRMC2NPxk9SFHo0cLFzG8WB9RaUbpy58yF7fLXn0XjD94IwogqsCAwEAAaN/MH0wHQYDVR0OBBYEFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtME4GA1UdIwRHMEWAFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkAiLkv4OzrUfswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABws5V3NQYoBnm6z6heIDrFWp59aLglcWMZPjzbKL7gNX8IetVL34mc+ESHm1ct//UXT0Ef0xGnPCgXSb3x6ixc=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/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-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 7a153971..6a5d979f 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -64,4 +64,44 @@
   <xi:include href="swamid-1.0/toylan3.umdc.umu.se.xml"/>
   <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
   <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml"/>
 </EntitiesDescriptor>
author	Leif Johansson <leifj@sunet.se>	2011-03-04 08:43:48 +0100
committer	Leif Johansson <leifj@sunet.se>	2011-03-04 08:43:48 +0100
commit	9c7295c7c0536e23747c4be75fd7058a764334bc (patch)
tree	19f7479526f4027d88c95a14958fdc8d5af10555
parent	c7c437e8629e4d998bddff4431373be04dca65f2 (diff)