4 files changed, 0 insertions, 368 deletions
diff --git a/swamid-2.0/apps.convertus.se-ki-shibboleth.xml b/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
deleted file mode 100644
index 07430d78..00000000
--- a/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://apps.convertus.se/ki/shibboleth">
-  <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>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://apps.convertus.se/ki/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Convertus Kursplaneöversättare</mdui:Description>
-        <mdui:Description xml:lang="en">Convertus Syllabus Translator</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
-        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>api4</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=api4</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAL51TunxrUTIMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGFwaTQwHhcNMTcwMTAzMTQ0NjEyWhcNMjcwMTAxMTQ0NjEyWjAPMQ0wCwYD
-VQQDEwRhcGk0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyLZewwoa
-Vy6azIumNQgjIvGCph0cK2VXaiyJUOPpjBLukfVPaLCQnqjeMWk84RNnV87FsNrb
-Aa/vHqobvne3CF98oeRT2ub6nJFHKVboBwnN9veMhg+g6wQKjEeeAJTG4mTP8OeS
-gIVLJveSSWedBxcOgVBbzsNYzUJbHUjGhPOdwwBZ+h7zy9Z6yml8/7gYFB5hc65K
-UUtx7Ui9WPpxoELlE7BEpFlLFbQYsA9vTE5YsVEqCUjf9zc9YBcvpc7KlL8cmCpM
-73ixrXx7KyEfc/DC03WfvQ7TFsp5XOyQ0Ue2VTWnp5obtmA9/SOJGvIvFVIVh3y0
-TTiKAMzvtYprVwIDAQABozIwMDAPBgNVHREECDAGggRhcGk0MB0GA1UdDgQWBBSs
-xl4iuwm50E2LnolSeONh/bPLFzANBgkqhkiG9w0BAQUFAAOCAQEARrFhmSPnS14P
-lqvYDmT5dmyXKpwiC0lXwxLjIY0NqH54qtUZ4yjS1jclTUz0AQ2WPNjXCOb2zcW5
-myQ4Lhbt5eM5Ve6YYYlZboxROjJ7bz/qsp3rRQwWbmOFXr1uOq7ZJHoZOYLOqcGg
-KQxIV/4Mu2cA2I2rpwOUmkXwVvtHvF48MFETiwH+vx7V3Ja1i9w7xFc8Vu7hZO7/
-50VHEvIBCh3d5aeEFVU6sj2l59cnBJFCE1Net9BfUxoGb1zu8G1TmuHbIgzZfBMB
-0hOktOuvrUnrIgccVdraaVUweFu8DWo4mtVCy3frrszI4KoIeaBDVC+1N2Ft+XeY
-zHEpRj4+aQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.convertus.se/ki/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/ki/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.convertus.se/ki/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.convertus.se/ki/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.convertus.se/ki/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sebastian Schleussner</md:SurName>
-    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/apps.convertus.se-kth-shibboleth.xml b/swamid-2.0/apps.convertus.se-kth-shibboleth.xml
deleted file mode 100644
index 140fa91c..00000000
--- a/swamid-2.0/apps.convertus.se-kth-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://apps.convertus.se/kth/shibboleth">
-  <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>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://apps.convertus.se/kth/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
-        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>api4</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=api4</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAL51TunxrUTIMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGFwaTQwHhcNMTcwMTAzMTQ0NjEyWhcNMjcwMTAxMTQ0NjEyWjAPMQ0wCwYD
-VQQDEwRhcGk0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyLZewwoa
-Vy6azIumNQgjIvGCph0cK2VXaiyJUOPpjBLukfVPaLCQnqjeMWk84RNnV87FsNrb
-Aa/vHqobvne3CF98oeRT2ub6nJFHKVboBwnN9veMhg+g6wQKjEeeAJTG4mTP8OeS
-gIVLJveSSWedBxcOgVBbzsNYzUJbHUjGhPOdwwBZ+h7zy9Z6yml8/7gYFB5hc65K
-UUtx7Ui9WPpxoELlE7BEpFlLFbQYsA9vTE5YsVEqCUjf9zc9YBcvpc7KlL8cmCpM
-73ixrXx7KyEfc/DC03WfvQ7TFsp5XOyQ0Ue2VTWnp5obtmA9/SOJGvIvFVIVh3y0
-TTiKAMzvtYprVwIDAQABozIwMDAPBgNVHREECDAGggRhcGk0MB0GA1UdDgQWBBSs
-xl4iuwm50E2LnolSeONh/bPLFzANBgkqhkiG9w0BAQUFAAOCAQEARrFhmSPnS14P
-lqvYDmT5dmyXKpwiC0lXwxLjIY0NqH54qtUZ4yjS1jclTUz0AQ2WPNjXCOb2zcW5
-myQ4Lhbt5eM5Ve6YYYlZboxROjJ7bz/qsp3rRQwWbmOFXr1uOq7ZJHoZOYLOqcGg
-KQxIV/4Mu2cA2I2rpwOUmkXwVvtHvF48MFETiwH+vx7V3Ja1i9w7xFc8Vu7hZO7/
-50VHEvIBCh3d5aeEFVU6sj2l59cnBJFCE1Net9BfUxoGb1zu8G1TmuHbIgzZfBMB
-0hOktOuvrUnrIgccVdraaVUweFu8DWo4mtVCy3frrszI4KoIeaBDVC+1N2Ft+XeY
-zHEpRj4+aQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.convertus.se/kth/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/kth/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.convertus.se/kth/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.convertus.se/kth/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.convertus.se/kth/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.convertus.se/kth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/kth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.convertus.se/kth/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sebastian Schleussner</md:SurName>
-    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml b/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
deleted file mode 100644
index db098606..00000000
--- a/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://appstest.convertus.se/ki/shibboleth">
-  <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>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://appstest.convertus.se/ki/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Convertus Kursplaneöversättare</mdui:Description>
-        <mdui:Description xml:lang="en">Convertus Syllabus Translator</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
-        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>api3</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=api3</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAM4W7luFWhWOMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGFwaTMwHhcNMTcwMTAzMTIxMTM2WhcNMjcwMTAxMTIxMTM2WjAPMQ0wCwYD
-VQQDEwRhcGkzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRXt3QWf
-N5E2bMP2ljefz9rUaXBVhbNFGXcwRx0cMHrRu8E1mAyiUaudwWCdlS7RNj928QzD
-EUyTjYOzdsg0TNNh9VD9FpDuSY5R2GInj7FgXhli04AICdwXTeUWUmPMijCNMVKA
-vqiQnSQ378yceQ1jwDyswU0WZq51ZL4f1HFsHqYVD+Smkpw269ws8UT+o1vr72x2
-jhQcPaLwtSn6VrcXcjHsK98BW+5ntWZGXo0VB9dlrBLN/Q3dWHpgRW64EnZKR1eI
-nQ9RZUD9ZVJS4RYdLz52AJ4lnoWqhGLDsbHaFq8cz7MXdNkz6XUY26apr1NmvLX6
-G68YhP1e3+27wwIDAQABozIwMDAPBgNVHREECDAGggRhcGkzMB0GA1UdDgQWBBTJ
-23fafou26NLzyHpCKjjk6EBkVTANBgkqhkiG9w0BAQUFAAOCAQEAmwOEUATHdPDZ
-IaVHnbX4elMwefL5g68tK6pg2/LBbOPQlpmVfxBPw2wnP8hSnD21jJSYRx/NyiTU
-rn2rya8PXnQ53XEUWLxRVEifgcZRaE1yCj5fEuXPyMPEoXDPPTTXkOp4XdypL/sW
-3e7MvPnmEw6B5/fxvxxzF4ewSU0shLNrmjUe5y/rfBqn2Ljwtk5GAqx/mczbMjcK
-BBjVJ1drKS6e/AUaryofNUGDrhBAvDVV8gR+p2iphKw/QMvZu/0YNXqVnMcCYqh0
-cYMiXwMsaQQKAcpoKkqhu6pbcGPCyfgASOR3WFshr6XKdSIFxA0bkmVmBXH4mqhT
-osdSjbJvuw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appstest.convertus.se/ki/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sebastian Schleussner</md:SurName>
-    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/appstest.convertus.se-kth-shibboleth.xml b/swamid-2.0/appstest.convertus.se-kth-shibboleth.xml
deleted file mode 100644
index 80e0fe96..00000000
--- a/swamid-2.0/appstest.convertus.se-kth-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://appstest.convertus.se/kth/shibboleth">
-  <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>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://appstest.convertus.se/kth/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
-        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>api3</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=api3</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAM4W7luFWhWOMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGFwaTMwHhcNMTcwMTAzMTIxMTM2WhcNMjcwMTAxMTIxMTM2WjAPMQ0wCwYD
-VQQDEwRhcGkzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRXt3QWf
-N5E2bMP2ljefz9rUaXBVhbNFGXcwRx0cMHrRu8E1mAyiUaudwWCdlS7RNj928QzD
-EUyTjYOzdsg0TNNh9VD9FpDuSY5R2GInj7FgXhli04AICdwXTeUWUmPMijCNMVKA
-vqiQnSQ378yceQ1jwDyswU0WZq51ZL4f1HFsHqYVD+Smkpw269ws8UT+o1vr72x2
-jhQcPaLwtSn6VrcXcjHsK98BW+5ntWZGXo0VB9dlrBLN/Q3dWHpgRW64EnZKR1eI
-nQ9RZUD9ZVJS4RYdLz52AJ4lnoWqhGLDsbHaFq8cz7MXdNkz6XUY26apr1NmvLX6
-G68YhP1e3+27wwIDAQABozIwMDAPBgNVHREECDAGggRhcGkzMB0GA1UdDgQWBBTJ
-23fafou26NLzyHpCKjjk6EBkVTANBgkqhkiG9w0BAQUFAAOCAQEAmwOEUATHdPDZ
-IaVHnbX4elMwefL5g68tK6pg2/LBbOPQlpmVfxBPw2wnP8hSnD21jJSYRx/NyiTU
-rn2rya8PXnQ53XEUWLxRVEifgcZRaE1yCj5fEuXPyMPEoXDPPTTXkOp4XdypL/sW
-3e7MvPnmEw6B5/fxvxxzF4ewSU0shLNrmjUe5y/rfBqn2Ljwtk5GAqx/mczbMjcK
-BBjVJ1drKS6e/AUaryofNUGDrhBAvDVV8gR+p2iphKw/QMvZu/0YNXqVnMcCYqh0
-cYMiXwMsaQQKAcpoKkqhu6pbcGPCyfgASOR3WFshr6XKdSIFxA0bkmVmBXH4mqhT
-osdSjbJvuw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appstest.convertus.se/kth/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://appstest.convertus.se/kth/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sebastian Schleussner</md:SurName>
-    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>