From 72bd2ba1ec07764aab7cb94b1d16eabe8b88cff6 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Wed, 17 Aug 2022 09:43:03 +0200
Subject: SWAMID-1169 SWAMID-1170

Removed:
 * registry-test.swamid.se
 * registry.swamid.se
---
 .../registry-test.swamid.se-saml2-metadata.xml     | 103 ---------------------
 swamid-2.0/registry.swamid.se-saml2-metadata.xml   |  77 ---------------
 swamid-sp-2.0.mxml                                 |   2 -
 3 files changed, 182 deletions(-)
 delete mode 100644 swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
 delete mode 100644 swamid-2.0/registry.swamid.se-saml2-metadata.xml

diff --git a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
deleted file mode 100644
index cbbfecf2..00000000
--- a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
+++ /dev/null
@@ -1,103 +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://registry-test.swamid.se/saml2/metadata/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-10T12:41:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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/nren-service</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 AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID PEER test instance</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID PEER Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test-instans av PEER för SWAMIDs registry</mdui:Description>
-        <mdui:Description xml:lang="en">Test instance of PEER for SWAMID's registry</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjICCQD47W+mEEsoTDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJT
-RTESMBAGA1UECAwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDESMBAGA1UEBwwJ
-U3RvY2tob2xtMSAwHgYDVQQDDBdyZWdpc3RyeS10ZXN0LnN3YW1pZC5zZTAeFw0x
-NzAyMDYxMDIwMzRaFw0xODAyMDYxMDIwMzRaMGcxCzAJBgNVBAYTAlNFMRIwEAYD
-VQQIDAlTdG9ja2hvbG0xDjAMBgNVBAoMBVNVTkVUMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIDAeBgNVBAMMF3JlZ2lzdHJ5LXRlc3Quc3dhbWlkLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwz4MSfErev1iNmp5pVa8K+z1RAfvOopjq10j
-32AEVggrmzstzr2a8FylTD7K1vBEneAclxu9suBozspS5XFdRlBX9Jdp2NYueYO/
-pGLpZE2enD3isN6vTEbSJGh9jJg3BLzDq8Jhoq3uhZAhG4RKnsCQ8EXO/tOr9qF4
-ZvIdxDGYnBZNxB2DG5QdkflcuM2nX+8aJOAglZ8Ehq79YC0DrzMECWkj6slF20Pc
-GHgsy0Kc9j9YENGG48ww2+YGUaibffqKJVIyjbKFlkDyw0dRFBlG0meEvjgBEv3c
-/cTSdDVzr84F+LH7QNVc6Fe9arDpAvaIxWkOuiPmEUYtW58HwwIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQAVGMpTEWE3wh4gmjyuIQXY2DWPtOpGaGA1XyOpvYXYCO2r
-92EC/B80dCiu55oQ+SIXNjBLpJRRhEhe4QAyEhC2CNhKjjVuzlFGYgOVatKqTzJQ
-gICDxUpYU6mpTp5Qfot0emSf2Wi+RjpM7XGd9jlrHs7KGhDq1cM+yd88J2hU4Wi1
-A2EwwDSszqYo6GssTRTLyGq7JbfELY2Y272BeEsS4AKgIOQTslwtSI0azbPHUWdQ
-8zgSKjNlO19JOG4nRfVEsjbaB+zDHIWPP7tWveDJfCG8pFquONxmJc68/IdBaL0D
-oMzgMjdgVTXdBPqXjdsunjPAiOZnJesxtLgWYEmQ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjICCQD47W+mEEsoTDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJT
-RTESMBAGA1UECAwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDESMBAGA1UEBwwJ
-U3RvY2tob2xtMSAwHgYDVQQDDBdyZWdpc3RyeS10ZXN0LnN3YW1pZC5zZTAeFw0x
-NzAyMDYxMDIwMzRaFw0xODAyMDYxMDIwMzRaMGcxCzAJBgNVBAYTAlNFMRIwEAYD
-VQQIDAlTdG9ja2hvbG0xDjAMBgNVBAoMBVNVTkVUMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIDAeBgNVBAMMF3JlZ2lzdHJ5LXRlc3Quc3dhbWlkLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwz4MSfErev1iNmp5pVa8K+z1RAfvOopjq10j
-32AEVggrmzstzr2a8FylTD7K1vBEneAclxu9suBozspS5XFdRlBX9Jdp2NYueYO/
-pGLpZE2enD3isN6vTEbSJGh9jJg3BLzDq8Jhoq3uhZAhG4RKnsCQ8EXO/tOr9qF4
-ZvIdxDGYnBZNxB2DG5QdkflcuM2nX+8aJOAglZ8Ehq79YC0DrzMECWkj6slF20Pc
-GHgsy0Kc9j9YENGG48ww2+YGUaibffqKJVIyjbKFlkDyw0dRFBlG0meEvjgBEv3c
-/cTSdDVzr84F+LH7QNVc6Fe9arDpAvaIxWkOuiPmEUYtW58HwwIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQAVGMpTEWE3wh4gmjyuIQXY2DWPtOpGaGA1XyOpvYXYCO2r
-92EC/B80dCiu55oQ+SIXNjBLpJRRhEhe4QAyEhC2CNhKjjVuzlFGYgOVatKqTzJQ
-gICDxUpYU6mpTp5Qfot0emSf2Wi+RjpM7XGd9jlrHs7KGhDq1cM+yd88J2hU4Wi1
-A2EwwDSszqYo6GssTRTLyGq7JbfELY2Y272BeEsS4AKgIOQTslwtSI0azbPHUWdQ
-8zgSKjNlO19JOG4nRfVEsjbaB+zDHIWPP7tWveDJfCG8pFquONxmJc68/IdBaL0D
-oMzgMjdgVTXdBPqXjdsunjPAiOZnJesxtLgWYEmQ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registry-test.swamid.se/saml2/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry-test.swamid.se/saml2/acs/" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SWAMID</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:GivenName>Leif</md:GivenName>
-    <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>mailto:leifj@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/registry.swamid.se-saml2-metadata.xml b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
deleted file mode 100644
index 12228b18..00000000
--- a/swamid-2.0/registry.swamid.se-saml2-metadata.xml
+++ /dev/null
@@ -1,77 +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://registry.swamid.se/saml2/metadata/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-09-29T16:51:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID PEER</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID PEER</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SWAMID metadata registry</mdui:Description>
-        <mdui:Description xml:lang="en">SWAMID metadata registry</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJALBwBoyJSdS3MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMMEnJlZ2lzdHJ5LnN3YW1pZC5zZTAeFw0xNDA5MjkxMzQ2MTZaFw0yNDA5MjYx
-MzQ2MTZaMB0xGzAZBgNVBAMMEnJlZ2lzdHJ5LnN3YW1pZC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALAmfWTwfXf3O85urmVux9wO0zgrIBWzUEEb
-gGNN0yKgYjvYR4w69b3olXKKTjCaJsCHksc7belAl3pqVShGdKmmDSN/E6+jl5ul
-GSYwFx52AlaMEMoPv7slVZbN1kcoPvaJ5t93vcM17JDaa8bROPb63MbCMcmAMgUm
-ZmSZrv1fu1cq08XVMHTQJ5BW7NmW7PaA+tbRckLI764L8Tv9aqewi3aRRp3OO2eX
-lGu/6tz6MhOGv8gdY5Y3XKuGanJQmt+FgTkcEKvlTvk7tYActi8SY6PiLXlMfoJF
-bSGSu1irUT/hC7x9kSCOPYH3vXJx+Z0PS3cRcYlyHi6/W/qqQJkCAwEAAaNQME4w
-HQYDVR0OBBYEFF3t1ekJ/iTlxpQSy9uKYOxAW8GsMB8GA1UdIwQYMBaAFF3t1ekJ
-/iTlxpQSy9uKYOxAW8GsMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-ACWRN5N5AfJSehnb6io22WftigC/HtY+yr2iaFtZfJXoLwtTHxffK7SKC84Ac6bu
-rovh0FUgfj4QWgQ06IL906ENaqEWNDRzUI9xWe+RCNEFVWvKyU5jh9j6JGG8JUYh
-Y84CiK5LlMi9XtAmNhClbOUP//3a5UHARhNmFcRxxiwfRY2k0sMNmhlk31xh+gwb
-CuQ36pkExudxFaHv+Vjv09LXtJxRnfvffGXFlT/DUeddhqC2vKtVoIg8S8295rOk
-jkl44jhVvXLSythVxryo/Mf7b8QbicsObxpxFMb9ifVbWyi5ri0WLgvQAXpyw/MH
-3lQIb3o7ibN/Oix1Wq0WXuA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registry.swamid.se/saml2/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry.swamid.se/saml2/acs/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">PEER SP</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SWAMID</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SWAMID</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SWAMID</md:Company>
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Lordal</md:SurName>
-    <md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>SWAMID</md:Company>
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Lordal</md:SurName>
-    <md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a7be7474..101529df 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -154,7 +154,6 @@
   <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>
   <xi:include href="swamid-2.0/mfa-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/registry.swamid.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/its-utv03.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
@@ -295,7 +294,6 @@
   <xi:include href="swamid-2.0/comanage-dev.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml"/>
   <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml"/>
-  <xi:include href="swamid-2.0/registry-test.swamid.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/test.play.rkh.se.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.chalmers.se.xml"/>
-- 
cgit v1.2.3