From e8c06641b0df788b52d1c89b4b990df47d3e66ab Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 21 Oct 2010 12:45:03 +0200
Subject: replace old kau IdPs with new

---
 swamid-1.0/idp.kau.se-saml2.xml |  35 ------------
 swamid-1.0/idp.kau.se.xml       |  32 -----------
 swamid-1.0/idp2.kau.se.xml      | 124 ++++++++++++++++++++++++++++++++++++++++
 swamid-1.0/shib-idp.kau.se.xml  |  41 -------------
 4 files changed, 124 insertions(+), 108 deletions(-)
 delete mode 100644 swamid-1.0/idp.kau.se-saml2.xml
 delete mode 100644 swamid-1.0/idp.kau.se.xml
 create mode 100644 swamid-1.0/idp2.kau.se.xml
 delete mode 100644 swamid-1.0/shib-idp.kau.se.xml

diff --git a/swamid-1.0/idp.kau.se-saml2.xml b/swamid-1.0/idp.kau.se-saml2.xml
deleted file mode 100644
index a2b9a950..00000000
--- a/swamid-1.0/idp.kau.se-saml2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-            <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad university (test)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Scott</md:SurName>
-    <md:EmailAddress>paul.scott@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/idp.kau.se.xml b/swamid-1.0/idp.kau.se.xml
deleted file mode 100644
index 17cb8b4a..00000000
--- a/swamid-1.0/idp.kau.se.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Karlstad university (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Scott</SurName>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/idp2.kau.se.xml b/swamid-1.0/idp2.kau.se.xml
new file mode 100644
index 00000000..941ee06b
--- /dev/null
+++ b/swamid-1.0/idp2.kau.se.xml
@@ -0,0 +1,124 @@
+<EntityDescriptor entityID="https://idp2.kau.se/idp/shibboleth"
+                  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">
+
+    <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">kau.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
+MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
+DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
+jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
+mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
+AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
+3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
+DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
+W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
+GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
+HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
+GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
+7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://idp2.kau.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://idp2.kau.se/idp/profile/SAML2/Redirect/SSO" />
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
+MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
+DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
+jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
+mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
+AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
+3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
+DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
+W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
+GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
+HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
+GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
+7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+    
+  <Organization>
+    <OrganizationName xml:lang="en">KAU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Karlstad University (SAML2)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Paul</GivenName>
+    <SurName>Scott</SurName>
+    <EmailAddress>paul.scott@kau.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Magnus</GivenName>
+    <SurName>Olsson</SurName>
+    <EmailAddress>magnus.olsson@kau.se</EmailAddress>
+  </ContactPerson>
+
+</EntityDescriptor>    
diff --git a/swamid-1.0/shib-idp.kau.se.xml b/swamid-1.0/shib-idp.kau.se.xml
deleted file mode 100644
index 57e1583f..00000000
--- a/swamid-1.0/shib-idp.kau.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.kau.se/identity">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kau.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEPTCCAyWgAwIBAgILAQAAAAABGTNtk4cwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDQwOTEzNDM0OVoXDTExMDQwOTEzNDM0OVowbTELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9zaGliLWlkcC5rYXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKOQIKbkk/FiMrF0SnFnN+leGueG0+qQMczfPQuUkTp1y+nhtIuvD+3t2pzPsuUcHtArrJjBKPg3Mp5Tt8cHWNdRl1j6l0TN1Rtk+1rmyMck5HZp1b296ldPtyCzon/txPB356CiT6KvW/iHY0hAiupIKdlWLK360ZGqThCPext1AgMBAAGjggFuMIIBajBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBRUfoCGld9kbPhwSgnkIMv3jWpxODA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGgYDVR0RBBMwEYIPc2hpYi1pZHAua2F1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAI/dNIi3iuS6nw4Tll1ZCc3kuHyG5In67CmtjO0owGmkh/4+B+ZHA37U5SZeKYPliiNqjUX6rlz4WYtvj/wFcAXSbcbgVRWkCVTkYahWL4DysGEanzeTJvWgcnJXix1JO6nifJYw8nJEBhuZrmrEuDj/5EmkekkGxRgGA9QgLSsYCnzkcm71R3PNO+rvSiBzY8MeIgiS96Jpe09iafVA0/w1Q8pyhLdLa8KWl80Rjjo/JVi34LECLwq9emIXIxNTr6ot3WdamoIZtEVOVbdwPoEAlekE87VJ2w7Y/yMqFz6bLp4cQ91PQZG91Y2NtQY4RBFCci5LO0dlcJTF2kMxkT</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.kau.se:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kau.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEPTCCAyWgAwIBAgILAQAAAAABGTNtk4cwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDQwOTEzNDM0OVoXDTExMDQwOTEzNDM0OVowbTELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9zaGliLWlkcC5rYXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKOQIKbkk/FiMrF0SnFnN+leGueG0+qQMczfPQuUkTp1y+nhtIuvD+3t2pzPsuUcHtArrJjBKPg3Mp5Tt8cHWNdRl1j6l0TN1Rtk+1rmyMck5HZp1b296ldPtyCzon/txPB356CiT6KvW/iHY0hAiupIKdlWLK360ZGqThCPext1AgMBAAGjggFuMIIBajBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBRUfoCGld9kbPhwSgnkIMv3jWpxODA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGgYDVR0RBBMwEYIPc2hpYi1pZHAua2F1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAI/dNIi3iuS6nw4Tll1ZCc3kuHyG5In67CmtjO0owGmkh/4+B+ZHA37U5SZeKYPliiNqjUX6rlz4WYtvj/wFcAXSbcbgVRWkCVTkYahWL4DysGEanzeTJvWgcnJXix1JO6nifJYw8nJEBhuZrmrEuDj/5EmkekkGxRgGA9QgLSsYCnzkcm71R3PNO+rvSiBzY8MeIgiS96Jpe09iafVA0/w1Q8pyhLdLa8KWl80Rjjo/JVi34LECLwq9emIXIxNTr6ot3WdamoIZtEVOVbdwPoEAlekE87VJ2w7Y/yMqFz6bLp4cQ91PQZG91Y2NtQY4RBFCci5LO0dlcJTF2kMxkT</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.kau.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.kau.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Karlstad university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Karlstad university</Company>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
-- 
cgit v1.2.3