From f2ff15b9da06c2221383f8286fdcfd1c35473bc0 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 5 May 2020 08:13:07 +0200
Subject: Resolves SWAMID-2953

---
 swamid-2.0/sig.idsec.se-sigservice.xml | 56 ----------------------------------
 swamid-sp-2.0.mxml                     |  1 -
 2 files changed, 57 deletions(-)
 delete mode 100644 swamid-2.0/sig.idsec.se-sigservice.xml

diff --git a/swamid-2.0/sig.idsec.se-sigservice.xml b/swamid-2.0/sig.idsec.se-sigservice.xml
deleted file mode 100644
index fff0593e..00000000
--- a/swamid-2.0/sig.idsec.se-sigservice.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sig.idsec.se/sigservice">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" 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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="sv">Underskriftstjänst för test och utvärdering</mdui:Description>
-        <mdui:Description xml:lang="en">Instance of a signing service for test and evaluation</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">SUNET unserskriftstjänst för test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET test signing service</mdui:DisplayName>
-        <mdui:Logo height="150" width="150">https://sig.idsec.se/sigservice/publish/logos/sunet-test/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://sig.idsec.se/sigservice</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=Signing Service Instance SUNET - TEST, O=SUNET, C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEETCCAnkCBF2IrwkwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCU0UxDjAMBgNVBAoMBVNVTkVUMS4wLAYDVQQDDCVTaWduaW5nIFNlcnZpY2UgSW5zdGFuY2UgU1VORVQgLSBURVNUMB4XDTE5MDkyMzExMzk1M1oXDTI5MDkyMzExMzk1M1owTTELMAkGA1UEBhMCU0UxDjAMBgNVBAoMBVNVTkVUMS4wLAYDVQQDDCVTaWduaW5nIFNlcnZpY2UgSW5zdGFuY2UgU1VORVQgLSBURVNUMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA08AogGOJts0vmLmR71xGnbXXEAPit1e7z34Q+3BO150SS7vJiHkVQiy3oYvQ/NaIpv3zgfOBugU/lRpy6/Z9zxxWQOu/PtW8E0BrcBRsg28x+6U9mfi4Wh7gdeL1UaZols1iPZJQ+b49eOaBErwczTYTY0gIIOCZudFFdGPlar1jz48YVFsChoXrCUaltRCOa1d/EIT6aiOIRgSCZWoy1n7LpSdrdQp5Wk7mvzksNi/qpwJMjDThLxe5PNn30+HjoKySQANhSH27GAxObNvt5/6zeYuCs/V7q9u15oJTU4MhPp/d13S87sw6v3utuv5RYCQXSg77hSkuhtTcqscj2vaa7lMiyspXwwuwile5m2MZKv1f9zBrVTPTee2J14LZeY7yBTcQ9GtRJILOunyX/RZVOiS8CUz26gosB0t6aUwOeRH7KJXeTnr2wEiY7KOV3p9y7oQRrIlp6l9SmsErQhJ64iM/GLieHrkSTeRUaRUxrpscm2hRgxnzSg62QNIRAgMBAAEwDQYJKoZIhvcNAQELBQADggGBAIqNn2uvp2roSV0xk0l8NIm/rx5p3UxB2NC8o33mf4heTaDdFH0aNOFNpr5iGPolC7r2u7Ac2BhxHKyTyuvvCEedtrK3nbUNNM/dsPkwlkD8rJ1uTOT4rGSKzJDMrCMb7vcFH+01LPZrwI3+pPO3QEOIcxGnOh6NOT3MtDnDYqUMwUXJRJ1/tnu1CUOgVX8Mu0A7c2Ps+yrxu3M/7mm6ll6TrqBHhHR+tG993AgJIsVRiyJmswh9wFPFZ7raUpRnvUne31/CE1Hp3un6C6fuq7fZ7mB5tZhG72XKNT/ZWbdX5A5kmrO3lAVMubqtbAduFX2oFhbidq6WJZaiHQF3RyfmXDQ4xB7hV1bDT02Ii9fBkUTX/7XxYzmUGyUj8CS0nMkr8FmMOHS6uZhPhXUullv4XuucyKxWUgBfEJh0E3D5VaA7qWldstRnEqzu7q+ku1zDEOJu8y+BG2XOIsBJtvFDzlDUBJTAX+cILTHAbKAyUrUTRv3EtE6Zaa+CQW1b2g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sig.idsec.se/sigservice/sign" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Santesson</md:SurName>
-    <md:EmailAddress>mailto:sts@aaa-sec.com</md:EmailAddress>
-    <md:TelephoneNumber>0767-861337</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Santesson</md:SurName>
-    <md:EmailAddress>mailto:sts@aaa-sec.com</md:EmailAddress>
-    <md:TelephoneNumber>0767-861337</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 39a0c1b4..a9c39608 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -584,7 +584,6 @@
   <xi:include href="swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml"/>
   <xi:include href="swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/sig.idsec.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sig.idsec.se-sigservice.xml"/>
   <xi:include href="swamid-2.0/humio.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/halon-eu.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test.fidus.sunet.se-shibboleth.xml"/>
-- 
cgit v1.2.3