Moved Config Files From main/resources/ To test/resources/config

- Reason: Integration tests need configuration, but config files
  should not be packaged into the final artifact.
- Update paths.

34 files changed, 12 insertions, 724 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java b/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java
index e02c11d..c2f06c2 100644
--- a/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java
+++ b/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java
@@ -13,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.function.Consumer;
 
 
@@ -36,7 +37,7 @@ public class MoaSigConfig {
                         @Value("${javax.net.ssl.keyStoreType}") String keyStoreType,
                         @Value("${moa.spss.server.default-trustprofile}") String defaultTrustProfile,
                         @Value("${moa.spss.server.configuration}") String spssConfigFilePath,
-                        @Autowired FileUtils fileUtils) throws FileNotFoundException {
+                        @Autowired FileUtils fileUtils) throws IOException {
         this.trustStoreType = trustStoreType;
         this.keyStoreType = keyStoreType;
         this.defaultTrustProfile = defaultTrustProfile;
@@ -46,18 +47,19 @@ public class MoaSigConfig {
         fallBackToSpringEnvForJavaxNetSSLStoreTypeProperty();
     }
 
-    private void fallBackToSpringEnvForMoaSPSSConfigProperty() throws FileNotFoundException {
+    private void fallBackToSpringEnvForMoaSPSSConfigProperty() throws IOException {
         log.info("value of spssConfigFilePath is {}", spssConfigFilePath);
 
         if(System.getProperty(MOA_SPSS_CONFIG_FILE_PROPERTY) == null) {
-            var realPath = fileUtils.determinePath(spssConfigFilePath);
-            var realFile = new File(realPath);
+
+            var realFile = new File(fileUtils.determinePath(spssConfigFilePath));
+            log.info("spssConfigFilePath.getCanonicalPath(): ", realFile.getCanonicalPath());
 
             if(realFile.exists() && realFile.canRead()) {
-                log.info(SET_PROPERTY_MSG_TEMPLATE, MOA_SPSS_CONFIG_FILE_PROPERTY, realPath);
-                System.getProperties().setProperty(MOA_SPSS_CONFIG_FILE_PROPERTY, realPath);
+                log.info(SET_PROPERTY_MSG_TEMPLATE, MOA_SPSS_CONFIG_FILE_PROPERTY, realFile.getCanonicalPath());
+                System.getProperties().setProperty(MOA_SPSS_CONFIG_FILE_PROPERTY, realFile.getCanonicalPath());
             } else {
-                throw new FileNotFoundException("File '" + realPath + "' does not exist or is not readable.");
+                throw new FileNotFoundException("File '" + realFile.getCanonicalPath() + "' does not exist or is not readable.");
             }
         }
     }
diff --git a/src/main/java/at/gv/egiz/moazs/util/FileUtils.java b/src/main/java/at/gv/egiz/moazs/util/FileUtils.java
index 7e7723d..eb1b291 100644
--- a/src/main/java/at/gv/egiz/moazs/util/FileUtils.java
+++ b/src/main/java/at/gv/egiz/moazs/util/FileUtils.java
@@ -8,7 +8,7 @@ import java.io.File;
 public class FileUtils {
 
     /**
-     * If path is relative, resolve path as classpath resource. If path is absolute,
+     * If path is relative, try to resolve path as classpath resource. If path is absolute,
      * leave as-is.
      */
     public String determinePath(String abstractPath) {
@@ -16,7 +16,8 @@ public class FileUtils {
             return abstractPath;
         } else {
             //java.lang.Class needs relative resources to start with "/"
-            return this.getClass().getResource("/" + abstractPath).getFile();
+            var resource = this.getClass().getResource("/" + abstractPath);
+            return resource == null ? abstractPath : resource.getFile();
         }
     }
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
deleted file mode 100644
index 0380cf5..0000000
--- a/src/main/resources/application.yaml
+++ /dev/null
@@ -1,191 +0,0 @@
-# Optional
-logging:
-  level:
-    root: WARN
-    org.springframework: WARN
-    at.gv: INFO #DEBUG
-    iaik: INFO #DEBUG
-    at.gv.egiz.moazs.backend:
-      SignatureVerifier: DEBUG
-      LogResponseSink: INFO
-
-    at.gv.egiz.moazs.backend.SaveResponseToFileSink: TRACE
-    at.gv.egiz.moazs.SaveResponseToFileSinkTest: TRACE
-
-# Mandatory
-# Default type for java's ssl key/trust store. When in doubt, set to
-# jks.
-javax.net.ssl:
-  keyStoreType: jks
-  trustStoreType: jks
-
-# Mandatory
-# Defines configuration profiles. Each profile contains all parameters
-# that are interpreted by moa-zs to determine how a delivery request
-# should be processed. Configure parameters here and/or in
-# DeliveryRequest/Config. You can select a profile per delivery
-# request by referring to the profile id in
-# DeliveryRequest/Config/ProfileId. If a parameter is missing, moa-zs
-# falls back to "default" You can override parameters in profiles.
-# Parameter have the following (descending) priority:
-#   DeliveryRequest/Config > [chosen-profile] > default
-delivery-request-configuration-profiles:
-
-  # Mandatory
-  # The "default" profile. Will be chosen if
-  # DeliveryRequest/Config/ProfileId is missing.
-  default:
-
-    # Optional
-    # Specifies in seconds, how long the mzs service maximally waits
-    # for a delivery request to complete. If the timeout is reached,
-    # the service will reply with "PartialSuccess" and handle
-    # responses asynchronously. A missing service-timeout means that the
-    # service waits indefinitely. See also: msg-response-sinks, which
-    # allows you to configure, how moa-zs handles asynchronous
-    # responses.
-    service-timeout: 60
-
-    # Mandatory
-    # If true, moa-zs asks the tnvz service if the receiver is
-    # addressable. Requires setting up the tvnz-client.
-    perform-query-person-request: false
-
-    # TODO: Move tnvz-client into perform-query-person-request to make relationship clearer (also
-    # TODO: add active)
-    # Mandatory (if perform-query-person-request is true)
-    # Parameters for the connection to tvnz. Specify url,
-    # connection-timeout, receive-timeout and ssl here. See msg-client
-    # for an exhaustive description of all parameters.
-    tvnz-client:
-
-      # Mandatory
-      url: http://localhost:8082/tnvz/
-      connection-timeout: 0
-      receive-timeout: 0
-
-      # Optional
-      #ssl: ...
-      #custom-http-headers:
-      #  X-PVP-NAME-1: VALUE-X
-      #  X-PVP-NAME-2: VALUE-Y
-      #  ...
-
-    # Mandatory
-    # Parameters for the connection to msg.
-    msg-client:
-
-      # Mandatory
-      url: http://localhost:8081/services/DeliveryRequest
-
-      # Mandatory
-      # Time in ms after which a connection will be closed. 0 means
-      # indefinitely.
-      connection-timeout: 0
-
-      # Mandatory
-      # Time in ms that the client waits after having sent the
-      # request. 0 means indefinitely.
-      receive-timeout: 0
-
-    # Mandatory
-    # Specifies how moa-zs should process asynchronous responses from msg.
-    msg-response-sinks:
-
-      # Mandatory
-      # Save response on the file system under the folder "path".
-      save-response-to-file:
-        # Mandatory
-        active: false
-        # Mandatory if activated
-        path: /msg-responses/
-
-      # Mandatory
-      # Log response to the at.gv.egiz.moazs.backend.LogResponseSink Logger.
-      log-response: true
-
-      # Mandatory
-      # Forward the response to mzs service.
-      forward-response-to-service:
-        # Mandatory
-        active: false
-        # Mandatory if activated
-        mzs-client:
-          url: http://service.which.implements.mzs2app.wsdl/services/
-          # connection-timeout
-          # receive-timeout
-          # ssl...
-
-  # Optional
-  # Add your own profiles (at wish) here. Follow the same structure as the "default" profile.
-  # Override parameters at wish.
-
-  # Example
-  # "ssl-profile" is an example for a profile that overrides msg client parameters
-  # to protect the msg connection with ssl client authentication.
-  ssl-profile:
-    msg-client:
-      url: https://localhost/zusemsg/services/DeliveryRequest
-      ssl:
-        ## Boolean; if true, app will trust all server certificates;
-        ## if false, server certificate needs to be in the truststore.
-        trust-all: false
-        ## Boolean; if true, app ignores mismatches between server's host name and
-        ## Certificate's common name / alternative subject name.
-        lax-hostname-verification: false
-        ## Parameters for ssl client auth
-        keystore:
-          ## Path to file
-          filename: ssl/client.cert.key.p12
-          ## Password to unlock key store.
-          password: 123456
-          ## JKS or PKCS12
-          type: PKCS12
-
-# Optional
-# If set to false, moa zs ignores an incomplete default DeliveryRequest-configuration
-# profile and continues startup. See 'delivery-request-configuration-profiles'.
-# Default value: true
-verify-completeness-of-default-delivery-request-configuration: true
-
-# Mandatory
-# Moa Spss Configuration
-moa.spss:
-
-  # Mandatory
-  is-active: true
-
-  # Mandatory
-  # If active, moa spss validates manifests in xml signatures.
-  is-manifest-check-active: false
-
-  # Mandatory
-  server:
-
-    # Mandatory
-    # Path that points to MoaSPSSConfiguration file; can be:
-    # - absolute path (unix: starts with /), or
-    # - relative path (otherwise, relative to application's class path)
-    configuration: moa-spss/MOASPSSConfiguration.xml
-
-    # Mandatory
-    # Select, which trust-profile moa spss uses to verify a signature.
-    default-trustprofile: test-trustprofile
-
-spring:
-  # Redis Setup (Cluster Mode)
-  redis:
-    host: 172.17.0.2
-    port: 6379
-  main.allow-bean-definition-overriding: true
-
-# Mandatory
-repository:
-
-  # Mandatory
-  # Duration in minutes before repository records are evicted.
-  expiresAfterWrite: 30
-
-# Optional
-# activate cluster mode
-#  profiles.active: cluster
diff --git a/src/main/resources/logback_config.xml b/src/main/resources/logback_config.xml
deleted file mode 100644
index 03c3834..0000000
--- a/src/main/resources/logback_config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<configuration>
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %20.20c | %10t | %m%n</pattern>
-    </encoder>
-  </appender>
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-  </root>
-</configuration>
diff --git a/src/main/resources/moa-spss/MOASPSSConfiguration.xml b/src/main/resources/moa-spss/MOASPSSConfiguration.xml
deleted file mode 100644
index d2425b4..0000000
--- a/src/main/resources/moa-spss/MOASPSSConfiguration.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper-->
-<cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<cfg:Common>
-		<cfg:PermitExternalUris>
-			<cfg:BlackListUri>
-				<cfg:IP>192.168</cfg:IP>
-			</cfg:BlackListUri>
-		</cfg:PermitExternalUris>
-	</cfg:Common>
-
-	<cfg:SignatureVerification>
-		<cfg:CertificateValidation>
-			<cfg:PathConstruction>
-				<cfg:AutoAddCertificates>true</cfg:AutoAddCertificates>
-				<cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess>
-				<cfg:CertificateStore>
-					<cfg:DirectoryStore>
-						<cfg:Location>certstore</cfg:Location>
-					</cfg:DirectoryStore>
-				</cfg:CertificateStore>
-			</cfg:PathConstruction>
-			<cfg:PathValidation>
-				<cfg:ChainingMode>
-					<cfg:DefaultMode>pkix</cfg:DefaultMode>
-					<cfg:TrustAnchor>
-						<cfg:Identification>
-							<dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
-							<dsig:X509SerialNumber>536</dsig:X509SerialNumber>
-						</cfg:Identification>
-						<cfg:Mode>chaining</cfg:Mode>
-					</cfg:TrustAnchor>
-					<cfg:TrustAnchor>
-             <cfg:Identification>
-               <dsig:X509IssuerName>C=AT,O=Hauptverband österr. Sozialvers.,CN=Root-CA 1</dsig:X509IssuerName>
-               <dsig:X509SerialNumber>376503867878755617282523408360935024869</dsig:X509SerialNumber>
-             </cfg:Identification>
-             <cfg:Mode>chaining</cfg:Mode>
-          </cfg:TrustAnchor>
-				</cfg:ChainingMode>
-
-				<cfg:TrustProfile>
-					<cfg:Id>test-trustprofile</cfg:Id>
-					<cfg:TrustAnchorsLocation>trustProfiles/test-trustprofile</cfg:TrustAnchorsLocation>
-				</cfg:TrustProfile>
-
-			</cfg:PathValidation>
-			<cfg:RevocationChecking>
-				<cfg:EnableChecking>false</cfg:EnableChecking>
-				<cfg:MaxRevocationAge>0</cfg:MaxRevocationAge>
-				<cfg:ServiceOrder>
-            <cfg:Service>CRL</cfg:Service>
-            <cfg:Service>OCSP</cfg:Service>
-         </cfg:ServiceOrder>
-          <cfg:Archiving>
-					<cfg:EnableArchiving>false</cfg:EnableArchiving>
-					<cfg:ArchiveDuration>365</cfg:ArchiveDuration>
-					<cfg:Archive>
-						<cfg:DatabaseArchive>
-							<cfg:JDBCURL>jdbc:url</cfg:JDBCURL>
-							<cfg:JDBCDriverClassName>fully.qualified.classname</cfg:JDBCDriverClassName>
-						</cfg:DatabaseArchive>
-					</cfg:Archive>
-				</cfg:Archiving>
-			</cfg:RevocationChecking>
-		</cfg:CertificateValidation>
-	</cfg:SignatureVerification>
-</cfg:MOAConfiguration>
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer
deleted file mode 100644
index eb051dc..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEUzCCAzugAwIBAgIDFE3dMA0GCSqGSIb3DQEBBQUAMIHPMQswCQYDVQQGEwJB
-VDGBizCBiAYDVQQKHoGAAEEALQBUAHIAdQBzAHQAIABHAGUAcwAuACAAZgD8AHIA
-IABTAGkAYwBoAGUAcgBoAGUAaQB0AHMAcwB5AHMAdABlAG0AZQAgAGkAbQAgAGUA
-bABlAGsAdAByAC4AIABEAGEAdABlAG4AdgBlAHIAawBlAGgAcgAgAEcAbQBiAEgx
-GDAWBgNVBAsTD0EtVHJ1c3QtUXVhbC0wMTEYMBYGA1UEAxMPQS1UcnVzdC1RdWFs
-LTAxMB4XDTE0MDcwMTExMjExNVoXDTI0MDcwMTA5MjExNVowgc8xCzAJBgNVBAYT
-AkFUMYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwA
-cgAgAFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAA
-ZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIA
-SDEYMBYGA1UECxMPQS1UcnVzdC1RdWFsLTAxMRgwFgYDVQQDEw9BLVRydXN0LVF1
-YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmhgdxIbxTGEOH
-fXGiewI3NFldAWKFWfLofO+5I1UbvA5avt7IgsGXz/tI/f5HGUbascI0i7xG0tqV
-lA5ctQgLRqxgxHtgTkMcqsAEYdsz3LZsCdXO1QrvEBGLTSABdxiL/gSWJ6z77CSw
-x7Xg02HwxPV82cjGkSF3ENGJntuIAAnRDWn/ORHjFatNRymoMbHaOEZXSGhf7Y5F
-rrHEqGyi9E6sv784De/T1aTvskn8cWeUmDzv//omiG/a/V9KQex/61XN8OthUQVn
-X+u/liL2NKx74I2C/GgHX5B0WkPNqsSOgmlvJ/cKuT0PveUgVFDAA0oYBgcE1KDM
-lBbN0kmPAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECEs8jB2F
-6W+tMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAQIN9LZbMivO9
-kWLDlDI9cTEIPpRXmgNdaBQRUpZc2ML0vDW6OVI90r8GxFQTE/I7HjrvuqQDTEL1
-qd8tthiazsLYI5eDX1CtJEFFtg25Y9t3tK2HsShb8sCj798hoXsOMFR9qhp5Fjb8
-TX4CVuQ3sK1TKeNlDmpAx6SqkYYT0CCMccsxt2j89ED8Z+B/yW19OZQk3BFDigYL
-46YsLKAC96ItFpUOs8ZbAUfUlpVA6G+09EMcDxOcuD/ebLx6I/ynwYAtqYXaizsY
-KTE35A3M2ghfGFJ+DlQoh3Bn/RG01LKXXgaVTHHMvvpxBp55wz2SocD/PpFe+D6Q
-C016YgTrrQ==
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer
deleted file mode 100644
index be29fb6..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDyzCCArOgAwIBAgIDFE3kMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRgwFgYDVQQLDA9BLVRydXN0LVF1
-YWwtMDIxGDAWBgNVBAMMD0EtVHJ1c3QtUXVhbC0wMjAeFw0xNDA3MDExMTIzMzNa
-Fw0yNDA3MDEwOTIzMzNaMIGLMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVz
-dCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRgwFgYDVQQLDA9BLVRydXN0LVF1YWwtMDIxGDAWBgNVBAMMD0Et
-VHJ1c3QtUXVhbC0wMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJaR
-q9eOsFm4Ab20Hq2Z/aH86gyWa48uSUjY6eQkguHYuszr3gdcSMYZggFHQgnhfLmf
-ro/27l5rqKhWiDhWs+b+yZ1PNDhRPJy+86ycHMg9XJqErveULBSyZDdgjhSwOyrN
-ibUir/fkf+4sKzP5jjytTKJXD/uCxY4fAd9TjMEVpN3umpIS0ijpYhclYDHvzzGU
-833z5Dwhq5D8bc9jp8YSAHFJ1xzIoO1jmn3jjyjdYPnY5harJtHQL73nDQnfbtTs
-5ThT9GQLulrMgLU4WeyAWWWEMWpfVZFMJOUkmoOEer6A8e5fIAeqdxdsC+JVqpZ4
-CAKel/Arrlj1gFA//jsCAwEAAaM2MDQwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4E
-CgQIQj0rJKbBRc4wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBh
-MfOINQm4XpzF6DmkOmb/ArSXHf5LObqFmIMooNr2TkyzrUTK/NE+mdrm15Rfdts7
-kZVq/ICfQSFeaPvWaAVq4plH/26OjvMTVv7DfgfPBUxDWqlCuDnDnPAVQ+yo/o5i
-BA5uUlMbp5znbDtlxwF/5gWqcn/hKxSUCP1uiOPIlKfeVvsRmBcJAdoixTM/Ic10
-pavJMGOI20onArvQZAUEbXQLA8cs8naxfF6Bo36U9nk6wn7q8VPXhViekByd17F6
-9A+ah0Iqw4SPf9BqNRIe1YxxjDhCmjWt3aoyE3ZFBuGjW+r2ipb/vGU1+2oyy2Fd
-2dMmiMQ7gGhWX9X6gWLd
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer
deleted file mode 100644
index e1100c7..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDyzCCArOgAwIBAgIDFE31MA0GCSqGSIb3DQEBBQUAMIGLMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRgwFgYDVQQLDA9BLVRydXN0LVF1
-YWwtMDMxGDAWBgNVBAMMD0EtVHJ1c3QtUXVhbC0wMzAeFw0xNDA3MDExMTMwNTZa
-Fw0yNDA3MDEwOTMwNTZaMIGLMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVz
-dCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRgwFgYDVQQLDA9BLVRydXN0LVF1YWwtMDMxGDAWBgNVBAMMD0Et
-VHJ1c3QtUXVhbC0wMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOe
-JIgc0s9AA0hqqqWgK72W9XwKn5+rUJDbQc5WgHkqwP2TU3qcW/NZYSSIY6PVGO6b
-hHSEnOyMPdrBhnpvNi4m6349yT6t565LdHcoKyQg/youwpVkEPZ+e8O32hF9nqvt
-L4wZohydjMwzcHUJB/5e+0CkJYwv/bVRZzqoK0yf1midYJukxWOw7nDNKD9KdOpZ
-+XXFAAZuH7BjwSqqE138y9JlGzkxIlrCeSJdGfFLwr7OHIgBdPEmQXcyOcaMUGjP
-U4VDig+gj+6OC5KjAEC+wKJZXiyhRLj+HyLTDLrQ6O8p5HI3Sov4FuwiMgcqIyzz
-o9fNyqmnT3K/vBGOqBsCAwEAAaM2MDQwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4E
-CgQIRgbfN/LCNxAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBy
-jA/CmId9oz8sy4rwEklti+8TLS/aLHkiMqUmKjuHyT/6mz4Qh4fLfAAEv8iGSZiW
-+7+Gv7HTcuEEdyNNhUmMGJLSQA/3KBjlttHXLiG943wnvcZf3LtkFc+8Ia5N3bNS
-BM6q7/OFKHSS+iHcAJ8XS6SnLITYRyfo0thsXBaHpkTUkEP0uJY+yoE/EcBkvsGX
-drLIawu8YOrNZvs3S6Ag0ex5brIdqiNtlUGwRxpLwssfBho5K0NqpXAloHT9kHBd
-rGb2GrVdLIesuVivSP9zq09M8bcm3jDPCHv5bcudPZVX7rkr79VphgLfKlINA4Fw
-VxCuPLXx/4sCfANQtvuY
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer
deleted file mode 100644
index b9a0e5a..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt
deleted file mode 100644
index 9befb53..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIDFl+uMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR0wGwYDVQQLDBRBLVRydXN0LVRl
-c3QtUm9vdC0wNTEdMBsGA1UEAwwUQS1UcnVzdC1UZXN0LVJvb3QtMDUwHhcNMTQx
-MjE1MTMwMDQ1WhcNMjQxMjA5MTIwMDQ1WjCBlTELMAkGA1UEBhMCQVQxSDBGBgNV
-BAoMP0EtVHJ1c3QgR2VzLiBmLiBTaWNoZXJoZWl0c3N5c3RlbWUgaW0gZWxla3Ry
-LiBEYXRlbnZlcmtlaHIgR21iSDEdMBsGA1UECwwUQS1UcnVzdC1UZXN0LVJvb3Qt
-MDUxHTAbBgNVBAMMFEEtVHJ1c3QtVGVzdC1Sb290LTA1MIICIDANBgkqhkiG9w0B
-AQEFAAOCAg0AMIICCAKCAgEApv3ETyDuseYGvBXgJSiAe7q2dvKtcxlHGlEdEWKv
-YUODdXiTIIcwuIU0+F8ybvoQdEVPGDsdzShhXKgMfdGY5WF1BslCgjwcr4h6GWgt
-cSkXXFIYVV5GCrac4DhM60EvtXpadi8dNMu7dUKZjqES9UPC6Gc5H6fadauLaV6b
-DbNrJufXUditjEbhqj5uX3u4/+nFRH8g1DiQm5RCC3ttVe0/7buJipErVQ9Sbhzk
-hkFlzLbph2s2hiEP8NB5tXM3ffxmJ2Yv98+U1Ec0iXvsoGhqRyZVn1huTi+9PJnP
-IyPfXDkqWv49E/WeZsaZ48kdVx9xIC6OVYF0GCDsKjsKWN+4xL6/eYvSnyIBij/A
-e1T3wkLhp+bDyqxnvDatMlWchfbZxicvzr83c8SGt81RBekwbG/HGPRE4x5DnTkQ
-67DTMzMSmW+FAJdZG2Ofsg9+D+v+iqRD310maLABtko3e+xm601FS8d0lDFJVGgG
-36IB+ZrUIXmLfOIQjlF/yx566oUmSif3QRgmnSuNtunffXHBbL0qFAiEDwwHg41t
-zBiSswKRWa5J/BMIung+6T8gw5kY3c3yJ+pUip4J2oeVa9jZlO/AY7k5BCeGh5Ky
-zu22GMQIp9ulIIfUKx8jcnhtDy07UEmaWqv3rVsqKWF9v9B4z2SMiH1oFEgrNAxi
-v98CAQOjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECEQv+xQJkonQMA4G
-A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEASO7M8elac5VTP+FjuL1S
-nS72NaIP/RGYmw6967irlG5qQ0cGmCZO5J8SsL7xc3BMofMQMbrsGEryO1F4Y95B
-o419IzqPb8sYHlx1Du+F2D01qXBmGP/NcqQIo9twLa+man16l7SFF/iNof2axigM
-TUcWzqHUxtSjCPoU44qTsi8vVuQKRP8gMGlVCty0joc0gEW8PqKiMaKxI+tglVA6
-czwvPXfk9pJkL3hhDg/p59iKJTkEKIDtvugrZ4ZqOCBL5xv1Tar3BMBAKSfl/YoQ
-/p6ATGlKkjSbMyU7vUGxXldNALHkezxFufuDZEF/erp3hCVADbQMKgyM7Diu6cKB
-0s4+POeTQoSQ2dnMQJdgAfeGcd3twy2s/M/xHAVGPAPIQWH7ppVcs6AbVXQabHxJ
-YZU7G2ct8Se0r8RLq+iRYrWhFKl8mmVBNwK2WJhjWPv2fqM1xYtbbwH6zoV/Sf8j
-uIbx/5A/MJo/4s/9ciafJLVzLvkOh6Bhf310TAxyB9mDiL00KAuVTDtwYfzo1+jw
-0bInpPqTCkgszn0LbajeaEIc7lQ7neY0gmMqDvnhA+5LyHJXuX5tDF+1/KDijlLs
-p/k1/YZfe1Ai1+gcRoAlp2O80tKaJWZPkf8POffyIkSxJbHlKF6r3TWs7JYr+YUi
-lm2dyCqZ9RUD5ZN2YRntJoo=
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer
deleted file mode 100644
index e90f5f2..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDXTCCAkWgAwIBAgIDFE3DMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNVBAYTAkFU
-MRAwDgYDVQQKEwdBLVRydXN0MRkwFwYDVQQLExBBLVRydXN0LW5RdWFsLTAxMRkw
-FwYDVQQDExBBLVRydXN0LW5RdWFsLTAxMB4XDTE0MDcwMTExMDk1NFoXDTI0MDcw
-MTA5MDk1NFowVTELMAkGA1UEBhMCQVQxEDAOBgNVBAoTB0EtVHJ1c3QxGTAXBgNV
-BAsTEEEtVHJ1c3QtblF1YWwtMDExGTAXBgNVBAMTEEEtVHJ1c3QtblF1YWwtMDEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD/9RyAEZ6eHmhYzNJ328f0
-jmdSUFi6EqRqOxb3jHNPTIpK82CR6z5lmSnZQNUuCPD+htbNZffd2DKVB06NOyZ1
-2zcOMCgj4GtkZoqE0zPpPT3bpoE55nkZZe/qWEX/64wz/L/4EdkvKDSKG/UsP75M
-tmCVY5m2Eg73RVFRz4ccBIMpHel4lzEqSkdDtZOY5fnkrE333hx67nxq21vY8Eyf
-8O4fPQ5RtN8eohQCcPQ1z6ypU1R7N9jPRpnI+yzMOiwd3+QcKhHi1miCzo0pkOaB
-1CwmfsTyNl8qU0NJUL9Ta6cea7WThwTiWol2yD88cd2cy388xpbNkfrCPmZNGLoV
-AgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECE5ZzscCMocwMA4G
-A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAO3hBdwsNQOtYOAlC2PKT
-sdNexKqMefFGrGDYIEAflaudwpcqUgv7fLLhMNRMT+BcXtqXtfNHGsll2GwseuMq
-C02bPUmbfNV4P9djIz/s6qqvNQaQneFzhuXn+i0YQ10sFFVeIL3qrBMl1lwBeQ64
-/GyvrbGiHuuagEUc25CDrUqni+b+azaPUsRG6IXkIWG0H6WIMqtxIdHzAV/1raKh
-PKot1VhG2rivf1cBBGXU/0VSYBitXrLNwXwlX2ad0WiFHUF8RS9F3j2vVSYMfxer
-NPNaRLtCkHNSqCIDkMmmHJKbJbKJzMaZYmX2i2nc16HCpE/gbQc3etQCl3GvzO88
-xw==
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer
deleted file mode 100644
index 2284687..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDFLT5MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
-dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTE0MDcyMzEwMzgy
-OVoXDTI1MDcyMzA4MzgyOVowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
-dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
-ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
-EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
-lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
-znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
-2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
-k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
-2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
-VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAEoykPeAA/6iKm6YnfxsSHFe+Dtian2yAH8L2TqMdcHeSB/7L1x73uuDeYku1
-hbKQAXnfXntf8R+VgjQBTww0aDb5164netYcFbK0g8uVWVCqOl8wf3JbAUxHS9br
-cFKks+CJKPr6qQ6H+sb1o9127c9IQSZYP3S/gMAaGw0cSTlsnosE0P5Ur5vHsapm
-FV3V+VOjYNs2GLSu4XQCYvSIpsfDJp8VsJ/BMYS9GqGvQ/9qGa0fwEbEMadb5mcJ
-tw/EKg4gJthMgxOfO5eVuCQ3PAEWOe5lrOrTdvTIlhphUuns5hoIdlyLuNqewK3s
-FJ6N46sU7LjJLqSKYEB8usoIiw==
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
deleted file mode 100644
index 33e7763..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der b/src/main/resources/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der
deleted file mode 100644
index 558ce15..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer
deleted file mode 100644
index 1bb4494..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer
deleted file mode 100644
index 6c0c042..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer
deleted file mode 100644
index 04627da..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEdzCCA1+gAwIBAgIDFLT9MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
-dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTE0MDcyMzEwNDIw
-NVoXDTI0MDcyMzA4NDIwNVowgYcxCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
-dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
-ZXJrZWhyIEdtYkgxFjAUBgNVBAsMDWEtc2lnbi1TU0wtMDMxFjAUBgNVBAMMDWEt
-c2lnbi1TU0wtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMjPM6
-PqgdPBPV4Efudpytt2Y4GZJfjeRdZo5SCuULDvvL+23xxBWnR3scFvfE1ekHN/YK
-k+2/qhU2B2ntoSNJSyDchNM8YPc9Lx67zZyhQTZgbBzh3IZAVb/hwuRRRV68JCBj
-r3r6v7IbwjH5XcVISdB4szx0z93aAQyKW9QkV+tD5a1vWFETvdHsZeVmDzfqcdsG
-AznPJw+9HrImCsswCWYUgPcFRkPNjj2r2NoyckVN781aWmNTAqJPf/Ckj9l9pUIt
-Vjhy8XNJW4iVDBkkykBXcGSkIau0ypJrRjsD1jKqUTIRZ/y2HlyltmwWi8OuyBLd
-LaHDbjc0b6JmqoivAgMBAAGjgeMwgeAwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4E
-CgQIQD6h02K0A90wEwYDVR0jBAwwCoAIRGqVZ1V5EU8wDgYDVR0PAQH/BAQDAgEG
-MIGUBgNVHR8EgYwwgYkwgYaggYOggYCGfmxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQv
-b3U9QS1UcnVzdC1uUXVhbC0wMyxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJl
-dm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1
-dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAQEAbHQvTl94ommGFln3s6wmd/tr6r5R
-3FR3A7O/uiGEAqm/7B84KGkTmKHhChGMiCiMcBSGtMx1IaO+t7gimLtRL57wgeIf
-k6nsgcbBioh0nO12XDagdtj75Dr7buEFyQvFdfydi5cAwScLW+YYxtwDni9/debd
-ypFKeCRxdCX12n0oFQDPJf8YvE4CaDitBJCQrZdJBDpB6muF8mpNq8CIuyTPIBZX
-RPKJNfIraKq/Xi7tuLkvWVGVsSqJeTvP++05Tvv/44+XBpCp3sUrjsb0G0Mj90PG
-SnAapsrgzDzLO/LQ8vrB9H2oRM4iYfUxu/dKSOBVXa3WQzsLBL0/9zZ30g==
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer
deleted file mode 100644
index a699436..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt
deleted file mode 100644
index ee17cdb..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGQTCCBCmgAwIBAgIDFl+4MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR0wGwYDVQQLDBRBLVRydXN0LVRl
-c3QtUm9vdC0wNTEdMBsGA1UEAwwUQS1UcnVzdC1UZXN0LVJvb3QtMDUwHhcNMTQx
-MjE1MTMxMDE5WhcNMjQxMjA5MTIxMDE5WjCBoTELMAkGA1UEBhMCQVQxSDBGBgNV
-BAoMP0EtVHJ1c3QgR2VzLiBmLiBTaWNoZXJoZWl0c3N5c3RlbWUgaW0gZWxla3Ry
-LiBEYXRlbnZlcmtlaHIgR21iSDEjMCEGA1UECwwaYS1zaWduLVRlc3QtUHJlbWl1
-bS1TaWctMDUxIzAhBgNVBAMMGmEtc2lnbi1UZXN0LVByZW1pdW0tU2lnLTA1MIIC
-IDANBgkqhkiG9w0BAQEFAAOCAg0AMIICCAKCAgEAq9PRwApA35K3LT0p5IYtNZMS
-BFJsIkzjgF4FRQ36PtxeNsPL6iPgfFjWLZzVT1arHrC6ciz97haDWEN5Jq+aVaZp
-gvFtvqZXlwYOWP0sshQg1aP7zrfH/N6yqjkrXHyzgmSz3SVIbdj5CqUJz/+94FCR
-cA8XkQ3WZAjSkRB+MSIY8umftkmJOVAstaG28OEtpmqwBLRh/QGcNZzfhyrPS2Ls
-5BAKQW9SBb1nXn8JOHq0Bd8zHShHbny9X/qT0xqeFfwItZWiW7iu3LgbGqfB3J4d
-s+9iecwHDsmYdSb2quGmzJXejmvktFZte9dlF7BuBqier+R3/czdLteRems5S9Ka
-hlP3+f3CnFwKihyVMhnuf5HyhCo1Fvrt+igWtNnos38qzB5RzRTJXnvZyrtTJMQE
-/8ZuV2B12Oaf0AQjt+o/SPKeaTBX2yes0S1xbQy7xJzNhgBJ2Ir3OI6SoOooVN+9
-kQuzD7NsJBJzIy4dHCvOgs0C1ro8DROaV3Usn58eYOkLDrPGpEBmFq7GnsxnbeEh
-5zzlgh00R9cy5PxiO40U+KxnTmQl+/vc9i1plDLsTRePeThKgS0UOIRZP7voYKdu
-IJaEzufNXUxZbCc9Mq3V552BmRPhL9Ouf/bfaVMmkY4p7BdU57stxDfVwG9biujj
-AVPA7DeRm+S0kzWRq0kCAQOjgY0wgYowPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDov
-L2NybC5hLXRydXN0LmF0L2NybC9BLVRydXN0LVRlc3QtUm9vdC0wNTATBgNVHSME
-DDAKgAhEL/sUCZKJ0DAPBgNVHRMBAf8EBTADAQH/MBEGA1UdDgQKBAhB0SNOEjM1
-3jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAEiqm52uEL2giMCy
-8i1tIbqKP3SeJnYxhJgN4d3caWqfE1CoEUQjsN8t7sF866TOYJMrQ+/dS8bUqNiG
-x4vvPrDq3DUSyKflgPaz+36xtB4BTlIiYTzio7Tnv+d5n+MsM6c/rijJzRx38FLM
-tZTAfr7dXv5KxrfYrrEnPrGg0gMlYqX3rB1TKQnPx5qG3e2YXc6tdvDeXhh9cXj3
-76VJony7iV0ccKWNXRRNx1X0po/Luu6EMD/5czArtmO0KmGXO3gK3Fy7pxUbdBra
-nSJNsY+Fv4X3zqf5n9ZM4Yut7KSqBiQbuMmIzLZkICJOWN5t9mOTStgmZjGqBdQN
-sRuVinaLxA88Fd32ZmFxbagOLeKEXPTQT/ERbDOjhShY6jA2/LkIcg9mwDDOubsp
-FcZaYlyXmvD+HNVxL5B4BGDWoGHmCxaj+bcYP4U797bpE90sTnMIQd6JoYEMQSIy
-Re0S4jKIOkCqBDkPBIXZf/IizTvJiQoFUtT7civFYhcUHDOcWs69NUU3F6sEBZmq
-C1uIRm7zD6FUPNpVcfVIeqcfWsnx5bSKwheh9Dk/A3eTmxjpodV4tIq6BfCLdq52
-85dumPB4zz/EmCuZ0hwy9/TJwaogVMqicvr1/pQXDM7T6fCM0vK9w/e4ejmX61TK
-6MsTXFjxlwpIacl4fkAxk6L22xfB
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer
deleted file mode 100644
index 60bc9a5..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIDFhIPMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRwwGgYDVQQLDBNhLXNpZ24tVEVT
-VC1RdWFsLTAxMRwwGgYDVQQDDBNhLXNpZ24tVEVTVC1RdWFsLTAxMB4XDTE0MTEx
-NzA3NDAzNloXDTI0MTExMTA2NDAzNlowgZMxCzAJBgNVBAYTAkFUMUgwRgYDVQQK
-DD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4g
-RGF0ZW52ZXJrZWhyIEdtYkgxHDAaBgNVBAsME2Etc2lnbi1URVNULVF1YWwtMDEx
-HDAaBgNVBAMME2Etc2lnbi1URVNULVF1YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQD4TRgyXzhxJ2AkndX0RPY771f64dsJrReEeuShLRK5io0B
-kJWc4t7wuD1B98cJ0MUPlMmOJ2Ckc/vuLhQUyY3qEUmhMhixCUIcdHQ5yH3H0yMV
-HxyJxAG83fE8M25kpKA4TzzMW8KPd2S63wbpPElyEy7vrllrLxvdQRSDpMZMvRg8
-fvoDGAehxsnKKwlXZuMq1aSBzfMz3cMBDKxvqzDIz7yC1iWNkdiwog3a5a5PbViK
-shhZ0h+bx9WFDpiN6ooPQgcGhjD+NqIDoiOr7CUFHp+HiC6xIsEFJaBHTf3dRZ61
-0r1FDABx0Yj8+wlXSQLYq/1nR/QMwsvH0Cz1qYTPAgMBAAGjNjA0MA8GA1UdEwEB
-/wQFMAMBAf8wEQYDVR0OBAoECE8h1CulBqTdMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAAOCAQEAimFu+xTm3UdyU+fO+2hz4DS20OGSC9NBDkorjzhRPWoZ
-IVhUi6yH5drqSBm4/2ZYS1Ba5npzfyJwm+cLO28ljxAApfRHlbN0y83hKv7c0I7g
-zWTMRs8X8ar5Gd7d4O5jpC4PAaZ1ozSDoE06U5im6YMLaJy/0QYvf5EQBMvLdeoc
-d1vl17JYKYqYzcX2dvayikrfiglFqDaZZ66yJPBSuiyNhXpPkbXsOoyyTPtV/0Bh
-eKIQiQyJID5aZtR7D4fBAzKdp5wB9KLQXBZ80hrwqrIuy+ME0tFaBWYBi8dzQ1iq
-/E3Qz0USfGmxPMm8y/zRqsDvxZCRiSuvzBkOXbGMdA==
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer
deleted file mode 100644
index e4bd48d..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer
deleted file mode 100644
index 74c4ce3..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer
deleted file mode 100644
index 6c50ec0..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer
+++ /dev/null
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt b/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt
deleted file mode 100644
index 9ea6d0c..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGQTCCBCmgAwIBAgIDFl+3MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR0wGwYDVQQLDBRBLVRydXN0LVRl
-c3QtUm9vdC0wNTEdMBsGA1UEAwwUQS1UcnVzdC1UZXN0LVJvb3QtMDUwHhcNMTQx
-MjE1MTMwOTAwWhcNMjQxMjA5MTIwOTAwWjCBoTELMAkGA1UEBhMCQVQxSDBGBgNV
-BAoMP0EtVHJ1c3QgR2VzLiBmLiBTaWNoZXJoZWl0c3N5c3RlbWUgaW0gZWxla3Ry
-LiBEYXRlbnZlcmtlaHIgR21iSDEjMCEGA1UECwwaYS1zaWduLVRlc3QtUHJlbWl1
-bS1FbmMtMDUxIzAhBgNVBAMMGmEtc2lnbi1UZXN0LVByZW1pdW0tRW5jLTA1MIIC
-IDANBgkqhkiG9w0BAQEFAAOCAg0AMIICCAKCAgEA2YDEweWMfTpWbHjFwzPl5tri
-jaL4tmhuHQzuSAEO080+m5Dc38Rj5xHf1MNCxvAx18+3A+b0WDDhtdJh+SXVxAQq
-/VhnaOFcdlvun0/4+l4Xynf6xd0r8WfQgnTAER4iFzGoWnOFQZqF3JGsx0mxd5Ss
-6kbs+4Gd/FmdAD09qTb+e3FtQC9aszVb5j57LB14Ka+iVXMEFq6J1uvvdjIcwbeL
-7gOGOLzn9dArFT4bfMIE/gBOJnY3Ulp16jOMGb2sY+9u9rGJ84jSpYKEsL+RBoJr
-23O5rfdrVi/+fWC0QaDqwhI46lLr9Erkk7NjEeElZ+Tj2A5KK4K0FNvzAIqxki1Z
-/MQcBfknbq9jxUZs4zUl9QA7ufCqmFhi4qQxycEfUEXsTFlya2IgWqavA1OFZ7Ww
-tJQOR/EQUvtH/fIE7nompnxzWxi1iAvVkv0OEsAYVRd9ldviLl9wLzpQoOPvwc/B
-kRLvriWH/Bjyc8+SeAfK92ZRHh+a1HBsX7XKuZwKJ/pVKF4EtalbZXlSuQau/Mc0
-ImS49AL/GjfShp/IhGHfBQbTjR3vhZfakG6wvSFnGaRt2ohxMHb0fSK7xNrDpfNV
-Orloh77ry44C4jjQIairRW1l4CLilbitKpHO4VtZ443w25fud2FapvdesoUfHogV
-KTce4dGvW3jrN7/8TRUCAQOjgY0wgYowPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDov
-L2NybC5hLXRydXN0LmF0L2NybC9BLVRydXN0LVRlc3QtUm9vdC0wNTATBgNVHSME
-DDAKgAhEL/sUCZKJ0DAPBgNVHRMBAf8EBTADAQH/MBEGA1UdDgQKBAhH2pAliBnO
-GzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBADDqJFkkBD6tUmiu
-L45YlXWKogD5eUfM+xnNVdg60M4HXHksVGT49CiY1vWzuLwUD3CXQ1W7yBKnLB5b
-GcoaHNgZDhNskYJCZu9K0g8oqNEN3Hb2QoKqyCaOlKV0dXILq/3SbdcXvUkUPS9K
-nWkX48tVMcw3OAmRYKwBK6tkUBwVw0VJ49sT+9qgPGCb8HYafSjCTnb3kdKGYK7a
-0E6eVBjYf6WcMfvCIYma5Zi4fx7U0K6RN8xJvhRHAZK3uJphk1QciAIxViFIPnex
-htgywJNHRautIsDbRGwdDVOUB6VdCFF19HnO9C4p2+pggCi9nT/I4CklZGZ5Q0VB
-j9knsSFXYMY9QFGm3feiVIXAy2Pp7IMB21KNZKgqCLQRgANNdvkWwO97lcxpmocS
-/p9LIEYDpa9tIvBrTiK39hUixeQaMhvlrSN3H49NqoxsStv8UEvSbjLJAuOcK1oV
-+IWA8RbBwippM45729X7nGdPUbxys+rn7F04WNe+oQN96hKX4VJ6OCANz1bca6LV
-sPtkFej+SLbpALVH3YvP4ct1UQms3UnuN9m1A0ceB4u4KroHBHlSGLB6K3UI3E42
-cYVaGrbflSvwwXxCHUvrCeL+eNKgI2Vyt29aHVJO0OMAS03Eb1PcygeNU4h6t+CS
-UBU+/OTtSQGrLe+kMKP6uBO/cMhv
------END CERTIFICATE-----
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt b/src/main/resources/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt
deleted file mode 100644
index ebfbce9..0000000
--- a/src/main/resources/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt
+++ /dev/null
diff --git a/src/main/resources/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der b/src/main/resources/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der
deleted file mode 100644
index 558ce15..0000000
--- a/src/main/resources/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der
+++ /dev/null
diff --git a/src/main/resources/ssl/client.cert.key.p12 b/src/main/resources/ssl/client.cert.key.p12
deleted file mode 100644
index f3becbf..0000000
--- a/src/main/resources/ssl/client.cert.key.p12
+++ /dev/null
diff --git a/src/main/resources/ssl/server/ca-chain.cert.pem b/src/main/resources/ssl/server/ca-chain.cert.pem
deleted file mode 100644
index 56953f0..0000000
--- a/src/main/resources/ssl/server/ca-chain.cert.pem
+++ /dev/null
@@ -1,70 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGEjCCA/qgAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAkFU
-MRAwDgYDVQQIDAdBdXN0cmlhMQ0wCwYDVQQKDARJQUlLMQ0wCwYDVQQLDARFR0la
-MSMwIQYDVQQDDBpFR0laIENSQUJFTlNURUlORVIgUk9PVCBDQTEvMC0GCSqGSIb3
-DQEJARYgY2hyaXN0b2YucmFiZW5zdGVpbmVyQGVnaXouZ3YuYXQwHhcNMTkwNDIz
-MTQzMzAzWhcNMjkwNDIwMTQzMzAzWjCBmzELMAkGA1UEBhMCQVQxEDAOBgNVBAgM
-B0F1c3RyaWExDTALBgNVBAoMBElBSUsxDTALBgNVBAsMBEVHSVoxKzApBgNVBAMM
-IkVHSVogQ1JBQkVOU1RFSU5FUiBJTlRFUk1FRElBVEUgQ0ExLzAtBgkqhkiG9w0B
-CQEWIGNocmlzdG9mLnJhYmVuc3RlaW5lckBlZ2l6Lmd2LmF0MIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEA3Y+ImG7TZmK7M4DxRaCbjtHA4jspyEDh2zjW
-Nu+nsxUMO2NxRZGNbOjEfVISP67gCd0RIf9AfBZ74qxGQjz/rEVMJP34ISfTV3yG
-p8krBrB1LFSRBoqDRs1ts8N+EgpslSQoJST/BvlqiIwVjQnK5KzbsBwabOWetNyq
-znHDQrHd9WSXTIeovPd067LR4o5A9x5T9MDbGCj6rak2QfcRB6F5yPvWah2J+c+w
-bDjojdFijSVRndBJiOik28gTG9rTLSJtg/HKIBmOsebrKe6va4FI/wwlw/yYcN/r
-xX3ErcJ3dI/DrS4+E8CqoDfvhwav+Px2qRcpZzVTWghqGdtvsmQFU1pBAddenSzJ
-cgHPkIVNHwRrE/r/vgmGWBXVsh8SEXaLcaTAhhLJ772TkI3lOui8VaXvRFj83qcF
-swqHQqFTsyysPTl2PNdgjsEGuyj68Sx8qkzj2pNIMACa+ouPiZC8cLewzG3q2igc
-hYBTOhIHckkxvvuL2ueG/4PFehEcyapBGzXzTTCZ2V3/mnobW1aR8x8H8Cg83Gli
-8Y0GAzG7GcQveKb1KJgUcSiRz98rWozmVev7hC9FL1Cg9eMVJ/sn7QVbcsF8chhP
-ESf82yj3LA3pbvjK6jBDEPeOjPbaTPqWe7l2oJCG2oQm6Uc8yh6rd+xlY1W5euav
-rY3zty8CAwEAAaNmMGQwHQYDVR0OBBYEFKedsAzhL4QgOr0g86GQcv50TxnzMB8G
-A1UdIwQYMBaAFIrz9UKOcwWk0qs9IS+T4YX+ozmLMBIGA1UdEwEB/wQIMAYBAf8C
-AQAwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQAj/xRC70726/au
-AFTYGgfGbPDb0lAfFl+SZCSjQgeMumCMinARNTcaX6xJovoBoUFsLHdwATS0+XEh
-q6aN7SO5fjvbHj/XV9opWBEBrquq2sUVJ0Sx2GPdvhXSr7qA8mheiHk8RFei3XRU
-g3qrLrGVo6esHcYchdFVTg7/09x2YWI9e8uV/HnFBhaxSCzuZBiUB/OagYUv+qEz
-LCceV3iwWdmZVIXj+f8WD7uP1tOCT5UJ/O0ds9BTGnB5ENOqvH1+FUy/iy9QUbr8
-HsFggVHtQM6pxwgXsPGgJkkHtLkPaTvDz8XfmYXljaI4MI/0PH3yq/ID4XyUyTBk
-olj4VAlNR7xcKXneS6OZj03CMG4slCCSeBVgNXeeMjPF8HdtMbvLMqdmHTFoiR4M
-Hwn2fKSJuyyJndFPCGKrFhvulCehagDm1B/gjj3aX8050tH9Gweyng+WGQFldbL6
-YLv7lYvju7lsNIOzd0KA94tdEYLRR5wHgBqW7BIWi66jM+rOPQVhDSPhNzYQ2RsM
-Hp9Hjfkgwf2M7ogt34rabpJ4ye8aRhOtZ2G03Cm6hCbB6sZAcCYZsYaoY8t/54rk
-2jgL53mILwDNFJpFXtqwron8jZDa8LrP6jzV/HzLKWnXDnRq/O86jyEedCCY0EfK
-rAo93z1tRTDtZ1PjlYHtixqjErPc0Q==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIGGTCCBAGgAwIBAgIUEzQUFWuzrC0F4mODQYgPZ/Lhq04wDQYJKoZIhvcNAQEL
-BQAwgZMxCzAJBgNVBAYTAkFUMRAwDgYDVQQIDAdBdXN0cmlhMQ0wCwYDVQQKDARJ
-QUlLMQ0wCwYDVQQLDARFR0laMSMwIQYDVQQDDBpFR0laIENSQUJFTlNURUlORVIg
-Uk9PVCBDQTEvMC0GCSqGSIb3DQEJARYgY2hyaXN0b2YucmFiZW5zdGVpbmVyQGVn
-aXouZ3YuYXQwHhcNMTkwNDIzMTQwNTU2WhcNMzkwNDE4MTQwNTU2WjCBkzELMAkG
-A1UEBhMCQVQxEDAOBgNVBAgMB0F1c3RyaWExDTALBgNVBAoMBElBSUsxDTALBgNV
-BAsMBEVHSVoxIzAhBgNVBAMMGkVHSVogQ1JBQkVOU1RFSU5FUiBST09UIENBMS8w
-LQYJKoZIhvcNAQkBFiBjaHJpc3RvZi5yYWJlbnN0ZWluZXJAZWdpei5ndi5hdDCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMclj0pHf7LxLXEvtz+P7mxI
-5U5Lx0xDiEY4XeLn75jis3IQotv3zmUz8Mvv9rkAT7y9JMJyJPBUPo2iWCO/dtm+
-qYlCy4fNPGvGPyjE05TM+JhG8bijpgO2EEZmKv48by+UUzioX8H/to5n8xNzDu8C
-bibBddbGyfQ9E7PkR2VhdW8PkUrqJCxeG/xiwS0h1U2v++4ZKQpS78rj75KNEExx
-t8spzZFyKV3i5mTkW2Exp5OSr07SpadjlRqkYWkdZsAPnaK4L4KQ+rrL9qXb/fzK
-syD2LkAHimV3s19IZjGVbdwCtgacDZlME3zNfGxIC0hAeJsSXJJN2FMO3SrnXv2b
-CDJT3SOCF+PMhmv41PGMswQxnCtPvB9659y/Cr/tHkY5bhQiR4XamZie7IkxpsMa
-WpV4jCY9iz1L8OsM62DVRsztDWw1w1j2dyWyODNbxaI7fEWg9klUW7GgEDYBeJ2h
-9kfgwZXiMZkw/7+0VHU97a7AKmpCXP3kH6n1z3MAgaf+Dd4Gq7RXB+4HEZ31uiNO
-OqrnayFs2td/X7cl/0ioNLnJ/hbaOmHsGDQo5W0WyXg9bVkLtezajVwTCKkRdUnn
-kAXL0y+x/aRc2CycE7tlC0SHtBDTVjdx5CWeulynBMMiMWZwb+HR9id/rnifp3Vk
-/CPA+eyjiVtt8uXXozLFAgMBAAGjYzBhMB0GA1UdDgQWBBSK8/VCjnMFpNKrPSEv
-k+GF/qM5izAfBgNVHSMEGDAWgBSK8/VCjnMFpNKrPSEvk+GF/qM5izAPBgNVHRMB
-Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAp/fR
-A+cZlMw0jtiFRYy7096dadgjefIcQVgZYNTL3zuPrXyRIHMp4dTlNnREkobmzkcy
-jWN/I41hm2SHt86+E1c7n/wd1KE1oefqoRkhQws84718zlLBkL/iMwluzE4ZzqiE
-RPxBFv23QqFLzaZpqan4ic9zlkqW1d8IZ9kt9vctAxUIju4hXqozUfaYIjIThutU
-wkIgN1A6e6qugFYB9jkhijnMw0HJeP19JbBUNGp9bP3GiSEc+S1ydddU2492rDQj
-NQKvUMvGUhoUdxbbcUhxs6i6Gfct5bCXRN+r7d+mpwFrpN9xv0a0a7y5GNZk//2S
-0qsqQwVEHYa0fDxsBFLnM7i2EY6+eo9mMccOgn0Jk8z+IIU3OCHgRs3df8R0zWbd
-2FSeqrHTTtgcnmfEx3TMZnuuLfOCIwczl/4DP6M5Z6xwp/MKXzUWFy5SP1wkLe9i
-KiTaYeYLiVZb4AluW8TdhkBjj87gA1gCqqGIAyQ6+40LGplt7Wt5pY2XGWqQQLcq
-qfutUjWQM+HOQEDsodrPu8DR07Q613XdrfMuJGHXDh7a+6xD0nRhpkR9JacoY1h/
-UTObjMFCIwIZ8bYniFLgmJhKlMiuhgNuGsEoSMsFHVDrCsEXZOKkoL8OmRu/V4zo
-2vewbMLL/jvutkmtS8E+R1lt+J6iEI5EYJHONrw=
------END CERTIFICATE-----
diff --git a/src/main/resources/ssl/server/server.localhost.cert.pem b/src/main/resources/ssl/server/server.localhost.cert.pem
deleted file mode 100644
index 2ecd8e1..0000000
--- a/src/main/resources/ssl/server/server.localhost.cert.pem
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGADCCA+igAwIBAgICEAIwDQYJKoZIhvcNAQELBQAwgZsxCzAJBgNVBAYTAkFU
-MRAwDgYDVQQIDAdBdXN0cmlhMQ0wCwYDVQQKDARJQUlLMQ0wCwYDVQQLDARFR0la
-MSswKQYDVQQDDCJFR0laIENSQUJFTlNURUlORVIgSU5URVJNRURJQVRFIENBMS8w
-LQYJKoZIhvcNAQkBFiBjaHJpc3RvZi5yYWJlbnN0ZWluZXJAZWdpei5ndi5hdDAe
-Fw0xOTA1MjAwODM4MjlaFw0yMDA1MjkwODM4MjlaMIGGMQswCQYDVQQGEwJBVDEQ
-MA4GA1UECAwHQXVzdHJpYTENMAsGA1UECgwESUFJSzENMAsGA1UECwwERUdJWjES
-MBAGA1UEAwwJbG9jYWxob3N0MTMwMQYJKoZIhvcNAQkBFiRjaHJpc3RvZi5yYWJl
-bnN0ZWluZXJAaWFpay50dWdyYXouYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC0yVt0MgEhQ4a+k2pCeWZa1oSoWnQ3XpCI5089ShGYzFPm+9YkfoSe
-Ml3Wyf0v7zUbjz1vHzqyH1LZ35wE5ZzftrasTg294tW+9iYeDpywxnN/dOMpDqWH
-J7Nylgo3YKPvKkH+9Oa9V0/NaFX/z6B1ukdvtaVbf2bu+pOE0AKthWq/0MNy62fK
-L0K/ARwgh05pwnrYGVwL6eI1tTzbFH30uj7udRwqcl3iiLQKHtcqd7NDjWIoTlZW
-0Ze9KLeBYkkiZ/HFpxokFDW5fnv0vQOQ+Jb3mUH42eRLo8oRqrnR+3UESr3bOILV
-jpU1tdtfgauEF8hWpefQvOgBabBpwFW5AgMBAAGjggFfMIIBWzAJBgNVHRMEAjAA
-MBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5l
-cmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBTtrFcxPt8JRBaGyDOH
-SFggJvTo3TCBwQYDVR0jBIG5MIG2gBSnnbAM4S+EIDq9IPOhkHL+dE8Z86GBmaSB
-ljCBkzELMAkGA1UEBhMCQVQxEDAOBgNVBAgMB0F1c3RyaWExDTALBgNVBAoMBElB
-SUsxDTALBgNVBAsMBEVHSVoxIzAhBgNVBAMMGkVHSVogQ1JBQkVOU1RFSU5FUiBS
-T09UIENBMS8wLQYJKoZIhvcNAQkBFiBjaHJpc3RvZi5yYWJlbnN0ZWluZXJAZWdp
-ei5ndi5hdIICEAEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMB
-MA0GCSqGSIb3DQEBCwUAA4ICAQB7NXX2Rqf6WwPCob3ioq+CI/+2DLW0vB8S+Vl3
-AVzy2RlEfmD7OOTZvGhvthNfLADoroXDNz1NgoHfAcyvd+AJYP4iiw4A/YaYuVa4
-fa+ZIqD6ak1n/TAvE+4fSNTAvj7l4nAouKsfBMTNls7fJo30jOkix1FGElsroe2r
-pm/xYP23qDWBdKQbgU/1YYi6TjZZjZSL+LXKhMcSTr8uqZLQsg+P5g3Z9NPcM1u/
-NuH8SwPOt4o7S4ThH5bwQmcVcLB1CWACmWKLuo1n+fgOCKoHCtolX/BdtFJFOWzH
-htqftSSemhfC6/mcldIg/llJfNkCEoC3ReQfejhyMThgXBTCtVUHhI1K+AZnRJJa
-16gUXPYzTKpNzV/vxRJA5YfNYI8ndmNGuw+Ke4BWK5bNNbJ++cpN7CXe1CEVMi4J
-46DEq5lWW30k34KsUb88yUEt3kcyi+mDDORU6v2WOWB43CEitT/cnmoYtOqPQ1ji
-s60hgSwz7ogFQMp7W0n5IGSbQZar3djDlb7fDMYBWbaSqML5rz6lkw3hatyNz7Kx
-vS2tvmqXXz91pfbbVHBi2bAFk/pM00DqTgu6SjfwwV53XUp9dtVfhG/3ywhotr9L
-A1cXPbEcZUcQ/IjW2bmsmvyEXZ/YMFKxWW1JzWZ8jPDiPWNe+OxIkS6DnS7QjMVv
-skoBYw==
------END CERTIFICATE-----
diff --git a/src/main/resources/ssl/server/server.localhost.key.pem b/src/main/resources/ssl/server/server.localhost.key.pem
deleted file mode 100644
index d9f7bc2..0000000
--- a/src/main/resources/ssl/server/server.localhost.key.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,BDACF14FCC41ACDBB5A24B955FB2884F
-
-BI+J5A05Bhu+7sqTkGH3ZqtD6Ax9U0NyeAZaA+UTPhQK/P4o1x3iWXqQ8TPcUpi+
-VYUcVOlwvaBRDCqcaJ7317FOKumhT7x9YjjMpvITPWpevz5Zo/TfNelONVe4SeFg
-IVO+syH8UzIcRAwW+tvtmOf/iEnOB0bUewm5cZ634LnPRQdTIIOzfqulCfHgGiGK
-1waXomgrBdZPNVQcY/EMWTXjL6h8CY6Ue+RMQzrTTZCOL51PdMMGHqFyKQ534b7n
-/hJFhO4Trhh1rCLHhMlhvilwiSmfiLLNNzIxu3rPc8WSrR6QhadaFz4bsayTlwJf
-BcpNeKUhewi2Drq9vcUg7oxSwSabOSFgxo0009oOB0GTU69KjMVKs+z4TykZiuh1
-GveIUlwbxOIuCENa9/Xw3VmvfRglx5vV5pxmWOHUsR5Pzq1Lg1VwDis0EcQWghTg
-caO6mahFrduP+IdjrXXkUSfDQGxVMprv3aqpQSp4kYbEjhP/xdfWcBrOt48Dor5k
-TlfeJhxwASdeo/O367oWhqXRxJSmz7y4BcXqFZQTNWhxLXGxJqI7+T8HF9arv8Fn
-KZPKyGY1GGBIMaf+xv6Fl9243LP1XuGu/fbLOcxh54poaV9+2KgzM8riPVrHaTdB
-O/f4rz6yrP4OY3deGnZh7/PtawARtosXv+3nFjHrYVOdG01P/iQZO6gpxuPyVuuc
-puy5lY4f9wQU1nBdvs+NpPL01K6HyIo9c8l/gDFA4Z4n0barSf+DbFYvTg/8bWFN
-cfuR1UtXRm7nwMNUmbo+v9UlEN1ez7YXOmYAJloW+x/3Cc1Xu4orOPTxWDKS9gFc
-IBsY9xZYWwDwP5yxYY0dKo7gwFROxZoJlvFHYdRgwwA6e6hm9ehNsmWouLQrB09d
-eD7jI4mcKT7AoTfbkzfoQm8WzG2MdhqfXYgxVx0Ek615Zzp3YOcuhhqMvy2tI7/7
-bGiT0rDTcZm+Sso4bpX6OBPeR5KGh5SfrnfmIxqd7+V/4w8H3pY0g2Rh92YyD1UA
-rt58b4HxJz4b1EYSCe8dV9MjhVFztGesfnwvgx5XGJWTY87hj6BBqoyOW3f5CwaO
-GRf+GV5p/QndFl7jcmVZH/5v9eJpvK6sneXC28zjEue6ximzZx8leN4UeebAKLMP
-+PZwUEtz/ZpCgVldthNH5Q44It+5YhqFch3R/TvuVVHmtVcUkDQiPyn6b7tLdOcM
-JzxAkaS5Ddye/CFNcVD+BiVwJU9ms+aT4qXV2fXTpYwYckE/gQ/wDt1XcUqfUZLq
-HTmlMYW9pSTDUQP0EGk8nic0bhv3x45xIrBXCog2gg6eXRyYXi9rQXMRJzVr0SGn
-GBKtM7/qhOGUzXrhqUx46YvdUApnxbeKqvYtN0k9VuMNP7a+ejVk5HYCuzNhNYyP
-ZKaLW7JbbjVjsSqRviHjeNtsqdnaRb4DP+MC1kkMsO5zLg53ztCRIitxJHmh9svb
-qtFsyf3N3LkJOqmysDBGUunFSD4BSoNxITJ5rJAO+biCoolC/xrkheI+InCT9zS+
-aMQVJNP47CMeZlsHa+0Jsoa9lKT1i+hQy5qPXeoUiWiBBQSN08aORyEpGyh1vTxC
------END RSA PRIVATE KEY-----
diff --git a/src/main/resources/ssl/server/server.localhost.key.pem.password b/src/main/resources/ssl/server/server.localhost.key.pem.password
deleted file mode 100644
index 22166b6..0000000
--- a/src/main/resources/ssl/server/server.localhost.key.pem.password
+++ /dev/null
@@ -1 +0,0 @@
-_gT7pZK),.^(+e4F
\ No newline at end of file
diff --git a/src/main/resources/ssl/trusted-cas-bundle.pem b/src/main/resources/ssl/trusted-cas-bundle.pem
deleted file mode 100644
index cb3f138..0000000
--- a/src/main/resources/ssl/trusted-cas-bundle.pem
+++ /dev/null
@@ -1,37 +0,0 @@
-EGIZ CRABENSTEINER ROOT CA:
-
------BEGIN CERTIFICATE-----
-MIIGGTCCBAGgAwIBAgIUEzQUFWuzrC0F4mODQYgPZ/Lhq04wDQYJKoZIhvcNAQEL
-BQAwgZMxCzAJBgNVBAYTAkFUMRAwDgYDVQQIDAdBdXN0cmlhMQ0wCwYDVQQKDARJ
-QUlLMQ0wCwYDVQQLDARFR0laMSMwIQYDVQQDDBpFR0laIENSQUJFTlNURUlORVIg
-Uk9PVCBDQTEvMC0GCSqGSIb3DQEJARYgY2hyaXN0b2YucmFiZW5zdGVpbmVyQGVn
-aXouZ3YuYXQwHhcNMTkwNDIzMTQwNTU2WhcNMzkwNDE4MTQwNTU2WjCBkzELMAkG
-A1UEBhMCQVQxEDAOBgNVBAgMB0F1c3RyaWExDTALBgNVBAoMBElBSUsxDTALBgNV
-BAsMBEVHSVoxIzAhBgNVBAMMGkVHSVogQ1JBQkVOU1RFSU5FUiBST09UIENBMS8w
-LQYJKoZIhvcNAQkBFiBjaHJpc3RvZi5yYWJlbnN0ZWluZXJAZWdpei5ndi5hdDCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMclj0pHf7LxLXEvtz+P7mxI
-5U5Lx0xDiEY4XeLn75jis3IQotv3zmUz8Mvv9rkAT7y9JMJyJPBUPo2iWCO/dtm+
-qYlCy4fNPGvGPyjE05TM+JhG8bijpgO2EEZmKv48by+UUzioX8H/to5n8xNzDu8C
-bibBddbGyfQ9E7PkR2VhdW8PkUrqJCxeG/xiwS0h1U2v++4ZKQpS78rj75KNEExx
-t8spzZFyKV3i5mTkW2Exp5OSr07SpadjlRqkYWkdZsAPnaK4L4KQ+rrL9qXb/fzK
-syD2LkAHimV3s19IZjGVbdwCtgacDZlME3zNfGxIC0hAeJsSXJJN2FMO3SrnXv2b
-CDJT3SOCF+PMhmv41PGMswQxnCtPvB9659y/Cr/tHkY5bhQiR4XamZie7IkxpsMa
-WpV4jCY9iz1L8OsM62DVRsztDWw1w1j2dyWyODNbxaI7fEWg9klUW7GgEDYBeJ2h
-9kfgwZXiMZkw/7+0VHU97a7AKmpCXP3kH6n1z3MAgaf+Dd4Gq7RXB+4HEZ31uiNO
-OqrnayFs2td/X7cl/0ioNLnJ/hbaOmHsGDQo5W0WyXg9bVkLtezajVwTCKkRdUnn
-kAXL0y+x/aRc2CycE7tlC0SHtBDTVjdx5CWeulynBMMiMWZwb+HR9id/rnifp3Vk
-/CPA+eyjiVtt8uXXozLFAgMBAAGjYzBhMB0GA1UdDgQWBBSK8/VCjnMFpNKrPSEv
-k+GF/qM5izAfBgNVHSMEGDAWgBSK8/VCjnMFpNKrPSEvk+GF/qM5izAPBgNVHRMB
-Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAp/fR
-A+cZlMw0jtiFRYy7096dadgjefIcQVgZYNTL3zuPrXyRIHMp4dTlNnREkobmzkcy
-jWN/I41hm2SHt86+E1c7n/wd1KE1oefqoRkhQws84718zlLBkL/iMwluzE4ZzqiE
-RPxBFv23QqFLzaZpqan4ic9zlkqW1d8IZ9kt9vctAxUIju4hXqozUfaYIjIThutU
-wkIgN1A6e6qugFYB9jkhijnMw0HJeP19JbBUNGp9bP3GiSEc+S1ydddU2492rDQj
-NQKvUMvGUhoUdxbbcUhxs6i6Gfct5bCXRN+r7d+mpwFrpN9xv0a0a7y5GNZk//2S
-0qsqQwVEHYa0fDxsBFLnM7i2EY6+eo9mMccOgn0Jk8z+IIU3OCHgRs3df8R0zWbd
-2FSeqrHTTtgcnmfEx3TMZnuuLfOCIwczl/4DP6M5Z6xwp/MKXzUWFy5SP1wkLe9i
-KiTaYeYLiVZb4AluW8TdhkBjj87gA1gCqqGIAyQ6+40LGplt7Wt5pY2XGWqQQLcq
-qfutUjWQM+HOQEDsodrPu8DR07Q613XdrfMuJGHXDh7a+6xD0nRhpkR9JacoY1h/
-UTObjMFCIwIZ8bYniFLgmJhKlMiuhgNuGsEoSMsFHVDrCsEXZOKkoL8OmRu/V4zo
-2vewbMLL/jvutkmtS8E+R1lt+J6iEI5EYJHONrw=
------END CERTIFICATE-----
diff --git a/src/main/resources/ssl/truststore.jks b/src/main/resources/ssl/truststore.jks
deleted file mode 100644
index 3f90814..0000000
--- a/src/main/resources/ssl/truststore.jks
+++ /dev/null
diff --git a/src/main/resources/ssl/truststore.p12 b/src/main/resources/ssl/truststore.p12
deleted file mode 100644
index 67eb611..0000000
--- a/src/main/resources/ssl/truststore.p12
+++ /dev/null