Resolves SWAMID-2198

4 files changed, 0 insertions, 61 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 82fb8ef3..485edd5f 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -40,7 +40,6 @@ dev.lobber.se-shibboleth.xml
 download.portal.chalmers.se-shibboleth.xml
 dwidp.nyautb.its.umu.se-dw-idp.xml
 e5.onthehub.com.xml
-egiswamid.egi.kth.se-shibboleth.xml
 epc.ub.uu.se-shibboleth.xml
 expert.antagning.se-ecs-sp.xml
 expert.nyautb.its.umu.se-ecs-sp.xml
diff --git a/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml b/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
deleted file mode 100644
index 0951c921..00000000
--- a/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://egiswamid.egi.kth.se/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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">e-academy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">e-academy</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>egiswamid.egi.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=egiswamid.egi.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAOKn91RkenjIMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB4XDTEzMDMwNTExNDU0NFoXDTIzMDMw
-MzExNDU0NFowHzEdMBsGA1UEAxMUZWdpc3dhbWlkLmVnaS5rdGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa3DK9UMbKQsvIuJuWLUT3nKRpKUfv
-P0hG4Y9YIjNTXuZWjAVt//FHHVyVVFiyOVjdS7ccgKBdlaQAgxz9TlVXWGkImFDr
-3FB2MBKAXZsqdK8goFzb6QKJJyIS7PRLWQgWWrZkUfESf2HZFbOZK4Q5XxdPu8VY
-DZMU/bwOPwGnO2D8NuJhiMUNSvsw652D0fft5iqoMu68T+RqkvHjt6etgOIRjOUe
-x0FEWmNjOEUXfmR8KEILSgE4LLn4MgBLjwS9f4AklfNaJzubq2CoDDKr5+QqObKa
-s4xt7xB5zaI8n2pWFi1Lik453ZjbyGNNrmIMVoKq8YqfbYbScT+dbGPFAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB0GA1UdDgQWBBSe
-YTmnl+7QvxX3lojqwxfovXBD7TANBgkqhkiG9w0BAQUFAAOCAQEAvjYyfsLqwLUA
-l1jw+FSIRQj1ync3bzU0Pw1i79RjYvSMip+TTScKqMlvfCowOaux0zrD9L9Zezbu
-38fVIa/77VZYFRNkt8uzaB5guMvO1O0XJbuCHl7/J9cdsRnhxFFMrGSQEAFKjXS4
-KhnBVBTB618v+Z3Yr3D4A+2ph5GhQreKEyWrEfKUCNLvI2s9IgF3NlnItHT0Z0VL
-PTw0p2GJzoMLwXYaiWVvGMDnJI9hSxIs+cJCtUUb19wCt3p2cILcFRfkHZR7aO1/
-/es1MnuKqzg9hCb7lpizP/bzSTUxfcVYd7rYACatWWZmXTB2INi4BbF8sFrdUYL9
-VESdo2ebFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (Ny)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (New)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 55ff8977..d8c02148 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -5,7 +5,6 @@
   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
-  <xi:include href="swamid-2.0/egiswamid.egi.kth.se-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/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml"/>
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b38edc32..62b55700 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -169,7 +169,6 @@
   <xi:include href="swamid-2.0/download.portal.chalmers.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portalservicesutv.miun.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-ki.pingpong.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml"/>