From 3c0212cfe45e76beebb6a633c921e57299a02b43 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 19 Jan 2012 09:37:34 +0100
Subject: add local copy of connect.funet.fi for testing

---
 swamid-2.0/connect.funet.fi.xml | 76 +++++++++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml              |  3 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 swamid-2.0/connect.funet.fi.xml

diff --git a/swamid-2.0/connect.funet.fi.xml b/swamid-2.0/connect.funet.fi.xml
new file mode 100644
index 00000000..e6b81358
--- /dev/null
+++ b/swamid-2.0/connect.funet.fi.xml
@@ -0,0 +1,76 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b5a364c3e2f8b955c76e73fe5271f137" entityID="https://sp.example.org/shibboleth">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/haka.funet.fi" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect.funet.fi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect.funet.fi</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANiIr0VuzJPZMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGNvbm5lY3QuZnVuZXQuZmkwHhcNMTIwMTEwMTM1NDEwWhcNMjIwMTA3MTM1
+NDEwWjAbMRkwFwYDVQQDExBjb25uZWN0LmZ1bmV0LmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxCUhfq/CC62u8NB6PeUAoldAnBjmKcP8RuDRcs37
+wNIZ7/jDYLngYBHklCYiv1fT6e+K6vm9ws+earIitJ2F55K9xJKIfxCq4uoQA05t
+vjiXYC3oZoKFwuRJ4qnauPblnf5DWVRM5oSf7dP5md4vM3Mhqyhs1dx3tw7xfcwc
+nIdU31F0yzjUoy38MUxB9I/pauVsCCVzEXtEhi6POzalp4bdqc+vO+8aWVUzAnrC
+hD+MNK/53v5NLpFJza+Q8m8VuyW2UJz8IAZ+MwiVSU89dnlREoYvPOl32ncQg3ef
+cjyYXrpnviy4eki3lAL3BnGdTjFhtXIf8nhiBHVazG3SgwIDAQABoz4wPDAbBgNV
+HREEFDASghBjb25uZWN0LmZ1bmV0LmZpMB0GA1UdDgQWBBRd3gKeGlkzk/l0VXyO
+I0W1QlhpFTANBgkqhkiG9w0BAQUFAAOCAQEAr3H/Okt1sByRWmUA+e7Ow0kJFapa
+hYQwPgkFEajTX6AZI+/WYON6/huWdaP1D8hSAUVsbNfKPOREoyNZpz+vMVvknwEZ
+TTBq+96qIBNKM2/rWFjkJqh2l8NMoND00knrNWNyVaJNQQqXNIK+e40ezwfOpAWh
+0B3Hvk7iuufeClUNW7A5+y2n1oD2yxjfDsCniO4LXAx1wG/hFLV9N7wphq8Ymy00
+spUs3SzEq9uJgBcQhIAdaUS+JeDIUu7ratBVYw+s0zZoBW5Nx6DvLHGz3S9CRV0i
+0XyC9/ygc5sTLugHy2SjJZGryf/M9thjZhWLhujaxeKqlqD6c93srNJqqg==
+</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>connect.funet.fi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect.funet.fi</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANiIr0VuzJPZMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGNvbm5lY3QuZnVuZXQuZmkwHhcNMTIwMTEwMTM1NDEwWhcNMjIwMTA3MTM1
+NDEwWjAbMRkwFwYDVQQDExBjb25uZWN0LmZ1bmV0LmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxCUhfq/CC62u8NB6PeUAoldAnBjmKcP8RuDRcs37
+wNIZ7/jDYLngYBHklCYiv1fT6e+K6vm9ws+earIitJ2F55K9xJKIfxCq4uoQA05t
+vjiXYC3oZoKFwuRJ4qnauPblnf5DWVRM5oSf7dP5md4vM3Mhqyhs1dx3tw7xfcwc
+nIdU31F0yzjUoy38MUxB9I/pauVsCCVzEXtEhi6POzalp4bdqc+vO+8aWVUzAnrC
+hD+MNK/53v5NLpFJza+Q8m8VuyW2UJz8IAZ+MwiVSU89dnlREoYvPOl32ncQg3ef
+cjyYXrpnviy4eki3lAL3BnGdTjFhtXIf8nhiBHVazG3SgwIDAQABoz4wPDAbBgNV
+HREEFDASghBjb25uZWN0LmZ1bmV0LmZpMB0GA1UdDgQWBBRd3gKeGlkzk/l0VXyO
+I0W1QlhpFTANBgkqhkiG9w0BAQUFAAOCAQEAr3H/Okt1sByRWmUA+e7Ow0kJFapa
+hYQwPgkFEajTX6AZI+/WYON6/huWdaP1D8hSAUVsbNfKPOREoyNZpz+vMVvknwEZ
+TTBq+96qIBNKM2/rWFjkJqh2l8NMoND00knrNWNyVaJNQQqXNIK+e40ezwfOpAWh
+0B3Hvk7iuufeClUNW7A5+y2n1oD2yxjfDsCniO4LXAx1wG/hFLV9N7wphq8Ymy00
+spUs3SzEq9uJgBcQhIAdaUS+JeDIUu7ratBVYw+s0zZoBW5Nx6DvLHGz3S9CRV0i
+0XyC9/ygc5sTLugHy2SjJZGryf/M9thjZhWLhujaxeKqlqD6c93srNJqqg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.funet.fi/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.funet.fi/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.funet.fi/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.funet.fi/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.funet.fi/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.funet.fi/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.funet.fi/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.funet.fi/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.funet.fi/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.funet.fi/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.funet.fi/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d5c64e37..fc6340f4 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -2,5 +2,6 @@
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
    <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
    <xi:include href="swamid-2.0/shibboleth.turnitin.com.xml"/>
-   <xi:include href="swamid-1.0/gidp.geant.net-sp.xml"/>
+   <xi:include href="swamid-2.0/gidp.geant.net-sp.xml"/>
+   <xi:include href="swamid-2.0/connect.funet.fi.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3