Merge branch 'master' of git.swamid.se:swamid-metadata

6 files changed, 0 insertions, 315 deletions

diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index f8ddf640..00000000
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,32 +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://box-idp.sunet.se/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://box-idp.sunet.se/simplesaml/saml2/idp/metadata.php">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDjjCCAnagAwIBAgIJAKbtZfJN7G7eMA0GCSqGSIb3DQEBBQUAMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTAeFw0xMjA0MTkwNzAxMTBaFw0yMjA0MTkwNzAxMTBaMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+53L5J4zaSe/ot/CU+fX/xsE0q2Vsvgs6Jrz4bgPtkiXcCCRcp1kV9wRxBEohK75DtumowRN9P0qL5SsawM5o6XflMpL9vhO1Xvi8NnrFp/utUnjwevgbxsi5efetqIezE+B8cimv1MEfN4/XxiCuKbqluEC4HYuopf9Cn32ob2VnQA31WYwW42+pfS733M4EIMYkpBdaacpJKFmCsu9BHnGgFTiSgJsvX9OGG7iwSB31Jp817BFOB0yhvx7Y2yFLSnRyyg/20BJ0t9R8UFVB4rx5bjyTlTGwvPg048UV8Go3wDSax18OT0AoTfE7O3QoXNOhPr1qi4bs0KL92R7sCAwEAAaOBmjCBlzAdBgNVHQ4EFgQUluTZFj+ee4BZ0slOOiUpsZG/KjwwaAYDVR0jBGEwX4AUluTZFj+ee4BZ0slOOiUpsZG/KjyhPKQ6MDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZYIJAKbtZfJN7G7eMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADPhDcfQDwHGhTeQuSDaBfa1/gbJkuiNRZSN000CIM1BalnuK5unV05SvBMG4t7mSj9oO+NnpjEBfV393I2XV5ICRuHbUpoX8tezGOA3I8amItR6WzJtFSn/Dv230KRcEuCAWz/A7LKog16eOPPDj64vBI9Lk5gYpXRB3y1Pnv+5IUgXb2YnS6XAEduHpm2dkj2CuSmpsWTPJapm/opsJvmrkZbvwQN1POPDyWW8Rb/gSr7XpFsDQ7lXObd2ADv82WENB6DLuUq1ilAkVR8Zs4OkFnLYASFUC25GtfUdUap/anb5gHF7a8MKN+NYlfNQWE1dm1jccCnA3eIBxkArDdU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDjjCCAnagAwIBAgIJAKbtZfJN7G7eMA0GCSqGSIb3DQEBBQUAMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTAeFw0xMjA0MTkwNzAxMTBaFw0yMjA0MTkwNzAxMTBaMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+53L5J4zaSe/ot/CU+fX/xsE0q2Vsvgs6Jrz4bgPtkiXcCCRcp1kV9wRxBEohK75DtumowRN9P0qL5SsawM5o6XflMpL9vhO1Xvi8NnrFp/utUnjwevgbxsi5efetqIezE+B8cimv1MEfN4/XxiCuKbqluEC4HYuopf9Cn32ob2VnQA31WYwW42+pfS733M4EIMYkpBdaacpJKFmCsu9BHnGgFTiSgJsvX9OGG7iwSB31Jp817BFOB0yhvx7Y2yFLSnRyyg/20BJ0t9R8UFVB4rx5bjyTlTGwvPg048UV8Go3wDSax18OT0AoTfE7O3QoXNOhPr1qi4bs0KL92R7sCAwEAAaOBmjCBlzAdBgNVHQ4EFgQUluTZFj+ee4BZ0slOOiUpsZG/KjwwaAYDVR0jBGEwX4AUluTZFj+ee4BZ0slOOiUpsZG/KjyhPKQ6MDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZYIJAKbtZfJN7G7eMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADPhDcfQDwHGhTeQuSDaBfa1/gbJkuiNRZSN000CIM1BalnuK5unV05SvBMG4t7mSj9oO+NnpjEBfV393I2XV5ICRuHbUpoX8tezGOA3I8amItR6WzJtFSn/Dv230KRcEuCAWz/A7LKog16eOPPDj64vBI9Lk5gYpXRB3y1Pnv+5IUgXb2YnS6XAEduHpm2dkj2CuSmpsWTPJapm/opsJvmrkZbvwQN1POPDyWW8Rb/gSr7XpFsDQ7lXObd2ADv82WENB6DLuUq1ilAkVR8Zs4OkFnLYASFUC25GtfUdUap/anb5gHF7a8MKN+NYlfNQWE1dm1jccCnA3eIBxkArDdU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.sunet.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.sunet.se/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
deleted file mode 100644
index 6bf736a8..00000000
--- a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
+++ /dev/null
@@ -1,101 +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://kaltura.saas-idp-test.swamid.se/Saml2/proxy_saml2_backend.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-02T22:24:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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/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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saas-idp-test.swamid.se/Saml2/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SUNET Play</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://sunet.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
-MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
-kBBZbZTpzSrVNhvvL6oa4c/vyhYh7Ba67JB35oQ7tjcf4YfLMs2N9YI1OVDX+FO+
-RebZedVNDcUVzqEkLN2rtwRwtniesEMxiRxwEh4CAo8GFy1LeZAc5QtZiJdFNWs5
-tfYTa2WmD++inPf3SymtDjbcB1pAAjLO5lxJoEVXTIZnAiqbvKfQvZpUSmidqoxO
-Gj3cIz211FATr0NvoSZxx9g9Frr7neXYCEfFg7bJXYKZB1CigXqtk1Q3/WBDL9Lz
-HdxAeaJ0cHUtgQXUnWQ93pkgRzvYxBEzn3utnwAmtbx41d2Cty0TfR3KE0CJq1dp
-AgMBAAGjUDBOMB0GA1UdDgQWBBSktczsx8ebU+NG/XG4xqo2AUxr8jAfBgNVHSME
-GDAWgBSktczsx8ebU+NG/XG4xqo2AUxr8jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQCAHoDP50F95ULtK9MRe9HBzj+4zK9XO8wTot6uY4G3gaeFDXUr
-zae5FbUFKnDbTACK/yUFjzPfSRWc5i8S9AdSIPJzQPffDTqOzKLKhhfAtRsHysxe
-MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
-OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
-2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
-vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
-MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
-kBBZbZTpzSrVNhvvL6oa4c/vyhYh7Ba67JB35oQ7tjcf4YfLMs2N9YI1OVDX+FO+
-RebZedVNDcUVzqEkLN2rtwRwtniesEMxiRxwEh4CAo8GFy1LeZAc5QtZiJdFNWs5
-tfYTa2WmD++inPf3SymtDjbcB1pAAjLO5lxJoEVXTIZnAiqbvKfQvZpUSmidqoxO
-Gj3cIz211FATr0NvoSZxx9g9Frr7neXYCEfFg7bJXYKZB1CigXqtk1Q3/WBDL9Lz
-HdxAeaJ0cHUtgQXUnWQ93pkgRzvYxBEzn3utnwAmtbx41d2Cty0TfR3KE0CJq1dp
-AgMBAAGjUDBOMB0GA1UdDgQWBBSktczsx8ebU+NG/XG4xqo2AUxr8jAfBgNVHSME
-GDAWgBSktczsx8ebU+NG/XG4xqo2AUxr8jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQCAHoDP50F95ULtK9MRe9HBzj+4zK9XO8wTot6uY4G3gaeFDXUr
-zae5FbUFKnDbTACK/yUFjzPfSRWc5i8S9AdSIPJzQPffDTqOzKLKhhfAtRsHysxe
-MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
-OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
-2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
-vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml b/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
deleted file mode 100644
index 78fdd13e..00000000
--- a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
+++ /dev/null
@@ -1,149 +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://outscan-idp-proxy.sunet.se/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-01T15:58:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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.geant.net/uri/dataprotection-code-of-conduct/v1</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets Outscan proxy</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet Outscan proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sunets proxy för inloggning till Outscan</mdui:Description>
-        <mdui:Description xml:lang="en">Sunet's proxy for logging into Outscan</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Outscan+proxy+Privacy+Policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Outscan+proxy+Privacy+Policy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUZ1Oow1fKz7Ch5AuZjSzGYxbzkXQwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjExMTAxMTQ0NzM2WhcN
-MzExMDMwMTQ0NzM2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ0vwZGstFedFgG1CbcU/wyv9i1BUeZb
-xGpG8tGCusCHyq9k1k+58XECuI0ZB2wiscSqSkQ/0WYWJ2Y2cLI4OWN5DRhffxya
-DYY7N+bSTnrNYRc1BLZ0zMgx4V5WX38KMU7l5Uc4Dldyd/2MUJf6HrdgyAXJfq3C
-mUByEMiBnjRABWb9T7DjVPeEinrEcCsBTRCfE+R/yhDOqMWZAIh18Suw6VrajJpp
-O/QxPGya0xtS35xoTIPdKRPDG+rJImU3xIUuxwyfyL/QW+Syz7DMX6T2BMsjhn95
-WkrzVSrRYLEaGT1ie8sLTZXIs43wMOF6dbuwXct5siRBrv4jeWTG1J4e7pX+fcyQ
-82nUw6fVEhThR9Y8zxQpIRWkL8cdeViCUsljcPJdHdsOjOH8JLZPtD10JrPey1Mf
-9y49Vp/bd1JVzoqGTtDElGpyhBf7IYXCXuKfDNl1pzyD8BJm4MdDhtbyPfwfcxFP
-7uw5Q34JPnatELH75CwE+zy4eIAf9roQuhebe41yK95xFsRSsF+nJjQLLbqbNKcp
-y13bcDag3Ht1HL0ZG1/X/a4igKQssKNAlXb6Lp3TCnbFtA2p4OqQLA1uKp3T8AKT
-ESEcpnpYjMVLMvyI9dBZ5GJkd7uOUS/aAY6mCG0yy1Fgc4vVF1yUgrxceRVO76fU
-kpA2nmqgMMQfAgMBAAGjUzBRMB0GA1UdDgQWBBRzew8/a5avJ9pAUc0WSE0MOGIS
-xDAfBgNVHSMEGDAWgBRzew8/a5avJ9pAUc0WSE0MOGISxDAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAcrXaSrLc8+q+ORftGkPrOZ/XFsOeE8edL
-La/jxCY88zcwYe7c+tswrJ2rrlbauLYFZgER/C5EogVjANSVjXsrpdFe45hZSjcf
-Q/wkkKmZDIRUnpB7xtB46gI0SKdPq5Q/s+XwAng1zQanvPOvtiUBqM/2tcJ12G/V
-VeJia1HTV37D5devU7RU60m9EOqAjlOvZzUDwrgyrCGn4INwQVDsMg8c1iq79L/a
-emaMAR0yBh37oh1mZtOEp1c/CBfQqwQCxk9MO+Q2yIBcDQweJtz56IjLJHAYNvYi
-wMLcAYvgu1aIQE3ekfJI7uEjWu2Wnmt2SQgE+077bXByPnxqTAz2jiD0mlIQs8lx
-PBrqYoOYWKMNSNZFEHZftvF7XCYc7yA0LWiCtuWzHisYxzSf/TU8apaLayfkG3Bt
-wEITIOasEXHXoC4G3CON6PWeIuBCbwuLuH7Nvx4wzDTsJ18pzP0dgY0UpAGAG55i
-plhjwuYy0LIBc4RBiw6xJIiuqmi5yjxiWqkQ/08imkWFcU4AinqrGu6qvNOY3SJt
-wJ00lTnZAj3RWRamQK26iShY+sFVrnsHuQgs29ov+L0gkKaM3efowD/6zUwbgmZs
-w5T3xuyviMVSu3BBZcA0YdGGtuvSSU+mj5UkeJO6DgBcNiOxAdxAFk5g1wjlGffp
-TkzG7ocEUA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUZ1Oow1fKz7Ch5AuZjSzGYxbzkXQwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjExMTAxMTQ0NzM2WhcN
-MzExMDMwMTQ0NzM2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ0vwZGstFedFgG1CbcU/wyv9i1BUeZb
-xGpG8tGCusCHyq9k1k+58XECuI0ZB2wiscSqSkQ/0WYWJ2Y2cLI4OWN5DRhffxya
-DYY7N+bSTnrNYRc1BLZ0zMgx4V5WX38KMU7l5Uc4Dldyd/2MUJf6HrdgyAXJfq3C
-mUByEMiBnjRABWb9T7DjVPeEinrEcCsBTRCfE+R/yhDOqMWZAIh18Suw6VrajJpp
-O/QxPGya0xtS35xoTIPdKRPDG+rJImU3xIUuxwyfyL/QW+Syz7DMX6T2BMsjhn95
-WkrzVSrRYLEaGT1ie8sLTZXIs43wMOF6dbuwXct5siRBrv4jeWTG1J4e7pX+fcyQ
-82nUw6fVEhThR9Y8zxQpIRWkL8cdeViCUsljcPJdHdsOjOH8JLZPtD10JrPey1Mf
-9y49Vp/bd1JVzoqGTtDElGpyhBf7IYXCXuKfDNl1pzyD8BJm4MdDhtbyPfwfcxFP
-7uw5Q34JPnatELH75CwE+zy4eIAf9roQuhebe41yK95xFsRSsF+nJjQLLbqbNKcp
-y13bcDag3Ht1HL0ZG1/X/a4igKQssKNAlXb6Lp3TCnbFtA2p4OqQLA1uKp3T8AKT
-ESEcpnpYjMVLMvyI9dBZ5GJkd7uOUS/aAY6mCG0yy1Fgc4vVF1yUgrxceRVO76fU
-kpA2nmqgMMQfAgMBAAGjUzBRMB0GA1UdDgQWBBRzew8/a5avJ9pAUc0WSE0MOGIS
-xDAfBgNVHSMEGDAWgBRzew8/a5avJ9pAUc0WSE0MOGISxDAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAcrXaSrLc8+q+ORftGkPrOZ/XFsOeE8edL
-La/jxCY88zcwYe7c+tswrJ2rrlbauLYFZgER/C5EogVjANSVjXsrpdFe45hZSjcf
-Q/wkkKmZDIRUnpB7xtB46gI0SKdPq5Q/s+XwAng1zQanvPOvtiUBqM/2tcJ12G/V
-VeJia1HTV37D5devU7RU60m9EOqAjlOvZzUDwrgyrCGn4INwQVDsMg8c1iq79L/a
-emaMAR0yBh37oh1mZtOEp1c/CBfQqwQCxk9MO+Q2yIBcDQweJtz56IjLJHAYNvYi
-wMLcAYvgu1aIQE3ekfJI7uEjWu2Wnmt2SQgE+077bXByPnxqTAz2jiD0mlIQs8lx
-PBrqYoOYWKMNSNZFEHZftvF7XCYc7yA0LWiCtuWzHisYxzSf/TU8apaLayfkG3Bt
-wEITIOasEXHXoC4G3CON6PWeIuBCbwuLuH7Nvx4wzDTsJ18pzP0dgY0UpAGAG55i
-plhjwuYy0LIBc4RBiw6xJIiuqmi5yjxiWqkQ/08imkWFcU4AinqrGu6qvNOY3SJt
-wJ00lTnZAj3RWRamQK26iShY+sFVrnsHuQgs29ov+L0gkKaM3efowD/6zUwbgmZs
-w5T3xuyviMVSu3BBZcA0YdGGtuvSSU+mj5UkeJO6DgBcNiOxAdxAFk5g1wjlGffp
-TkzG7ocEUA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Sunet Outscan proxy</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Sunet Outscan proxy</md:ServiceName>
-      <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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Sunet Security Contact</md:GivenName>
-    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.sub.su.se.xml b/swamid-2.0/www.sub.su.se.xml
deleted file mode 100644
index fd3988b5..00000000
--- a/swamid-2.0/www.sub.su.se.xml
+++ /dev/null
@@ -1,29 +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://www.sub.su.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIB2TCCAUKgAwIBAgIJAIRfFzH12j9JMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDXd3dy5zdWIuc3Uuc2UwHhcNMDgwNTE0MTQ0NzQ5WhcNMDkwNTE0MTQ0NzQ5WjAYMRYwFAYDVQQDEw13d3cuc3ViLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/9u6s9iHrmj7IvMgSpT8UEzo+Wld9S1QKximd7S6vkIf2arFtvC+Wr04ilfgS6Sp4fOXtGoo9nM7rp6CCdg2RNsrrPUrbs/QkLS5kii2lvQgJ+Q+cJNyJBJhUOgczKcF1nax1roIHKoRMrlRaaeYPv2hh4cVWT23gE5sd+L4pgwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBABcE9tkmR3jTnoWrU5o54zbUKsehvKJozqBrMInvLqwyURkUG2M2jHG+RLtJ0VXBYqtEPbjq0O0kQ6JjAlciMsgv9SVyYryhMjtHZujTalMnRwLF7uWNtR62wY+w53G+7dr9F6cOh4bCXqEN/xs8SoYEymgUBrfKR8SVNxRihZFk</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sub.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.su.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Stockholm university</md:Company>
-    <md:GivenName>Conny</md:GivenName>
-    <md:SurName>Richardson</md:SurName>
-    <md:EmailAddress>mailto:conny.richardson@sub.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f0da790a..42dba80a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -44,7 +44,6 @@
   <xi:include href="swamid-2.0/account.mdh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dedserv79.levonline.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.augustus.se.xml"/>
-  <xi:include href="swamid-2.0/www.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/samsok.libris.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
   <xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
@@ -200,7 +199,6 @@
   <xi:include href="swamid-2.0/www.start.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.student.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml"/>
-  <xi:include href="swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml"/>
   <xi:include href="swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-miun.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-lu-general-sp.xml"/>
@@ -563,7 +561,6 @@
   <xi:include href="swamid-2.0/kth-nav.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/phid.kb.se-saml-sp.xml"/>
   <xi:include href="swamid-2.0/rdi.humlab.umu.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/service4mobility.su.se-mobility_test.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index e489c2be..b429acc4 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -6,7 +6,6 @@
   <xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/openidp.feide.no.xml"/>
   <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>