Removed connect.funet.fi

Signed-off by noc@funet.fi

2 files changed, 0 insertions, 96 deletions

diff --git a/swamid-2.0/connect.funet.fi-shibboleth.xml b/swamid-2.0/connect.funet.fi-shibboleth.xml
deleted file mode 100644
index b87d2569..00000000
--- a/swamid-2.0/connect.funet.fi-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://connect.funet.fi/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-18T16:14:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <idpdisc:DiscoveryResponse 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>
-        <ds:KeyName>connect.funet.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect.funet.fi</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAKZpZsXKkzHCMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGNvbm5lY3QuZnVuZXQuZmkwHhcNMTIwMjE2MTE0NTMwWhcNMTUwMjE1MTE0
-NTMwWjAbMRkwFwYDVQQDExBjb25uZWN0LmZ1bmV0LmZpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA9qHZQfn+2SyyuRhpm+wnEIxXj4eZjNkfQvy/hSih
-fDvnx5QpNerbXt+SIy2YQHmFhn5N5Hdn1onPf91IzshAQVXacIdzqFEXdwl2k4M9
-Bw7FiObtFokW4ukEZTEnDPhwTu89oaVuXLLsGt9tCiNBKaSniip4HpMMBEK41jU4
-wzmm+LSQF8xYl+AgagZaydHCVSIQC1PnXqPR1dcnoBzP2t01YqWCfCyxHjHVBYtk
-jrXpse9rb0pj1xlurvG1lveqeAStM8AkXiP2gSBQpv88y/YU6UgT1eOLsI65Ox2w
-ZWTd36jYbUxHOsRAsZxSy0IokvGIHDK6ykjU9wLthwWXYwIDAQABoz4wPDAbBgNV
-HREEFDASghBjb25uZWN0LmZ1bmV0LmZpMB0GA1UdDgQWBBRxLCa7bCuoP7HKshs5
-Fyw8ab6LXzANBgkqhkiG9w0BAQUFAAOCAQEAxw74TU9pNDmMVFq7AXkvHOlnKM9q
-l7c5F7D/KVXOrigwiIn0xwj+kr4ElZp1qrVLgC+fEHk9C2uKR9iJiR1z2SnOEn1U
-TeFtpdM7HaGBivCjsX5d1zMiTILSNkU7u+cJPH9EASOnTjSIbktDfHLApZ+t9yfg
-NPPGeZN6Q8qZuKoJBi7obLAsWbcTSxgIBrYK4G0BS9Hiy3W4gp1gqTflpYx0YBHv
-rNvLo5T1BgsjLc1kQsoAAn8pUP8GHb1KSJ0SY2IKV+k9oWEF3Nd1n/+43bPB666B
-EMBSvHkNXEFDf/FDbw4kjn5ie1pmF4qu+jHVHyB4y4Roz0QFoYIeOWaRMw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>connect.funet.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect.funet.fi</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAKZpZsXKkzHCMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGNvbm5lY3QuZnVuZXQuZmkwHhcNMTIwMjE2MTE0NTMwWhcNMTUwMjE1MTE0
-NTMwWjAbMRkwFwYDVQQDExBjb25uZWN0LmZ1bmV0LmZpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA9qHZQfn+2SyyuRhpm+wnEIxXj4eZjNkfQvy/hSih
-fDvnx5QpNerbXt+SIy2YQHmFhn5N5Hdn1onPf91IzshAQVXacIdzqFEXdwl2k4M9
-Bw7FiObtFokW4ukEZTEnDPhwTu89oaVuXLLsGt9tCiNBKaSniip4HpMMBEK41jU4
-wzmm+LSQF8xYl+AgagZaydHCVSIQC1PnXqPR1dcnoBzP2t01YqWCfCyxHjHVBYtk
-jrXpse9rb0pj1xlurvG1lveqeAStM8AkXiP2gSBQpv88y/YU6UgT1eOLsI65Ox2w
-ZWTd36jYbUxHOsRAsZxSy0IokvGIHDK6ykjU9wLthwWXYwIDAQABoz4wPDAbBgNV
-HREEFDASghBjb25uZWN0LmZ1bmV0LmZpMB0GA1UdDgQWBBRxLCa7bCuoP7HKshs5
-Fyw8ab6LXzANBgkqhkiG9w0BAQUFAAOCAQEAxw74TU9pNDmMVFq7AXkvHOlnKM9q
-l7c5F7D/KVXOrigwiIn0xwj+kr4ElZp1qrVLgC+fEHk9C2uKR9iJiR1z2SnOEn1U
-TeFtpdM7HaGBivCjsX5d1zMiTILSNkU7u+cJPH9EASOnTjSIbktDfHLApZ+t9yfg
-NPPGeZN6Q8qZuKoJBi7obLAsWbcTSxgIBrYK4G0BS9Hiy3W4gp1gqTflpYx0YBHv
-rNvLo5T1BgsjLc1kQsoAAn8pUP8GHb1KSJ0SY2IKV+k9oWEF3Nd1n/+43bPB666B
-EMBSvHkNXEFDf/FDbw4kjn5ie1pmF4qu+jHVHyB4y4Roz0QFoYIeOWaRMw==
-</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:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">FUNET E-Meeting Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">FUNET E-Meeting Service (Adobe Connect)</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 87838187..71050ca5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -2,7 +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-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/connect.funet.fi-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml"/>
   <xi:include href="swamid-2.0/secure.urkund.com-shibboleth.xml"/>