From 1a40486716242fd975178f4199f421897090eea5 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Wed, 12 Mar 2014 16:05:48 +0100
Subject: sp:s added for samltest.swamid.se SWAMIDOPS-7180

---
 swamid-2.0/samltest.swamid.se-coc-sp.xml         | 65 +++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-nren-sp.xml        | 65 +++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-re_eu-sp.xml       | 66 +++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-re_hei-sp.xml      | 66 +++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-re_nren-sp.xml     | 66 +++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml | 67 ++++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-sfs-sp.xml         | 65 +++++++++++++++++++++++
 swamid-2.0/samltest.swamid.se-sp.xml             | 58 ++++++++++++++++++++
 8 files changed, 518 insertions(+)
 create mode 100644 swamid-2.0/samltest.swamid.se-coc-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-nren-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-re_eu-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-re_hei-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-re_nren-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-sfs-sp.xml
 create mode 100644 swamid-2.0/samltest.swamid.se-sp.xml

diff --git a/swamid-2.0/samltest.swamid.se-coc-sp.xml b/swamid-2.0/samltest.swamid.se-coc-sp.xml
new file mode 100644
index 00000000..6f1ea719
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-coc-sp.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/coc/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/re_nren_sfs/coc/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/re_nren_sfs/coc/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-nren-sp.xml b/swamid-2.0/samltest.swamid.se-nren-sp.xml
new file mode 100644
index 00000000..d5c18f44
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-nren-sp.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/nren/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
new file mode 100644
index 00000000..1a808d74
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/re_eu/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/re_nren_sfs/coc/re_eu/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/re_nren_sfs/coc/re_eu/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
new file mode 100644
index 00000000..f98dcb18
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/re_hei/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
new file mode 100644
index 00000000..6ea11c2d
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/re_nren/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/re_nren/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/re_nren/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
new file mode 100644
index 00000000..a943a837
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/re_nren_sfs/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/re_nren_sfs/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/re_nren/nren/re_hei/re_nren_sfs/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-sfs-sp.xml b/swamid-2.0/samltest.swamid.se-sfs-sp.xml
new file mode 100644
index 00000000..51e70d68
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-sfs-sp.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://samltest.swamid.se/sfs/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/sfs/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/sfs/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-sp.xml b/swamid-2.0/samltest.swamid.se-sp.xml
new file mode 100644
index 00000000..0fb6a8ce
--- /dev/null
+++ b/swamid-2.0/samltest.swamid.se-sp.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="http://samltest.swamid.se/sp.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
+MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
+CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
+CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
+VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
+EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
+pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
+P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
+Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
+6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
+idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
+5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
+xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
+Z3dVKh4xfib5HaL6Bl2ks8LF
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://samltest.swamid.se/acs/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://samltest.swamid.se/acs/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
-- 
cgit v1.2.3