Merge branch 'main' into eip-4844-interop

# Conflicts: # CHANGELOG.md # ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java # ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java # ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java # ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/CancunTargetingGasLimitCalculator.java # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java # gradle.properties # gradle/verification-metadata.xml # gradle/versions.gradle # plugin-api/build.gradle
2 years ago · 79e564e8f3
parent be897114c7 e18e407c4e
commit 79e564e8f3
215 changed files with 1235 additions and 3062 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -1,12 +1,12 @@
 ---
 version: 2.1
 orbs:
-  win: circleci/windows@2.2.0
+  win: circleci/windows@5.0

 executors:
  besu_executor_small:
    docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
    resource_class: small
    working_directory: ~/project
    environment:
@ -14,7 +14,7 @@ executors:

  besu_executor_med: # 2cpu, 4G ram
    docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
    resource_class: medium
    working_directory: ~/project
    environment:
@ -22,8 +22,8 @@ executors:
      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2

  besu_arm64_executor_med: # 2cpu, 8G ram
-    machine:
-      image: ubuntu-2004:202101-01
+    machine: #https://circleci.com/developer/machine/image/ubuntu-2204
+      image: ubuntu-2204:2022.10.2
    resource_class: arm.medium
    working_directory: ~/project
    environment:
@ -32,15 +32,15 @@ executors:

  besu_executor_xl: # 8cpu, 16G ram
    docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
    resource_class: xlarge
    working_directory: ~/project
    environment:
      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4

  xl_machine_executor:
-    machine:
-      image: ubuntu-2004:202201-02 #Ubuntu 20.04, Docker v20.10.12, Docker Compose v1.29.2, Google Cloud SDK updates
+    machine: #https://circleci.com/developer/machine/image/ubuntu-2204
+      image: ubuntu-2204:2022.10.2
    resource_class: xlarge

  trivy_executor:
@ -60,6 +60,7 @@ commands:
            sudo apt-get update
            sudo apt-get install -y libsodium23 libsodium-dev libjemalloc-dev apt-transport-https haveged libnss3-tools
            sudo service haveged restart
+            java --version
      - restore_gradle_cache
  restore_gradle_cache:
    description: "Restore Gradle cache"
@ -269,13 +270,13 @@ jobs:
          at: ~/project
      - setup_remote_docker
      - run:
-          name: hadoLint_openjdk_11
+          name: hadoLint_openjdk_17
          command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile
      - run:
-          name: hadoLint_openjdk_11_debug
+          name: hadoLint_openjdk_17_debug
          command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11-debug/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17-debug/Dockerfile
      - run:
          name: hadoLint_openjdk_latest
          command: |
@ -302,9 +303,9 @@ jobs:
      - attach_workspace:
          at: ~/project
      - run:
-          name: hadoLint_openjdk_11
+          name: hadoLint_openjdk_17
          command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile
      - run:
          name: hadoLint_openjdk_latest
          command: |
@ -313,6 +314,11 @@ jobs:
          name: hadoLint_graalvm
          command: |
            docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install -q --assume-yes openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
      - run:
          name: build image
          command: |
@ -354,6 +360,11 @@ jobs:
      - prepare
      - attach_workspace:
          at: ~/project
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install -q --assume-yes openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
      - run:
          name: Publish Docker
          command: |
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@ -16,7 +16,7 @@ jobs:
        uses: actions/setup-java@v2
        with:
          distribution: adopt
-          java-version: 11
+          java-version: 17
          cache: gradle
      - name: spotless
        run: ./gradlew --no-daemon --parallel clean spotlessCheck
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -41,6 +41,12 @@ jobs:
    - name: Checkout repository
      uses: actions/checkout@v3

+    - name: Set up Java
+      uses: actions/setup-java@v2
+      with:
+        distribution: adopt
+        java-version: 17
+
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
      uses: github/codeql-action/init@v2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,11 @@

 ### Breaking Changes
 - Add a new CLI option to limit the number of requests in a single RPC batch request. Default=1 [#4965](https://github.com/hyperledger/besu/pull/4965)
-
 - Changed JsonRpc http service to return the error -32602 (Invalid params) with a 200 http status code
+- Besu requires minimum Java 17 and up to build and run [#3320](https://github.com/hyperledger/besu/issues/3320)
+- PKCS11 with nss module (PKCS11 based HSM can be used in DevP2P TLS and QBFT PKI) does not work with RSA keys 
+in Java 17. SoftHSM is tested manually and working. (Other PKCS11 HSM are not tested). The relevant unit and acceptance 
+tests are updated to use EC private keys instead of RSA keys.

 ### Additions and Improvements
 - Added option to evm CLI tool to allow code execution at specific forks [#4913](https://github.com/hyperledger/besu/pull/4913)
@ -13,7 +16,10 @@
 - Add new KZG precompile and option to override the trusted setup being used [#4822](https://github.com/hyperledger/besu/issues/4822)
 - Add implementation for eth_createAccessList RPC method [#4942](https://github.com/hyperledger/besu/pull/4942)
 - Updated reference tests to v11.3 [#4996](https://github.com/hyperledger/besu/pull/4996)
- Add DebugGetRawBlock and DebugGetRawHeader RPC methods [#5011](https://github.com/hyperledger/besu/pull/5011)  
+- Add DebugGetRawBlock and DebugGetRawHeader RPC methods [#5011](https://github.com/hyperledger/besu/pull/5011)
+- Besu requires minimum Java 17 and up to build and run [#3320](https://github.com/hyperledger/besu/issues/3320)
+- Add `max_fee_per_data_gas` field to transaction [#4970](https://github.com/hyperledger/besu/pull/4970)
+- Gas accounting for EIP-4844 [#4992](https://github.com/hyperledger/besu/pull/4992)

 ### Bug Fixes

@ -25,8 +31,6 @@
 - Support for new DATAHASH opcode as part of EIP-4844 [#4823](https://github.com/hyperledger/besu/issues/4823)
 - Send only hash announcement for blob transaction type [#4940](https://github.com/hyperledger/besu/pull/4940)
 - Add `excess_data_gas` field to block header [#4958](https://github.com/hyperledger/besu/pull/4958)
- Add `max_fee_per_data_gas` field to transaction [#4970](https://github.com/hyperledger/besu/pull/4970)
- Gas accounting for EIP-4844 [#4992](https://github.com/hyperledger/besu/pull/4992)

 ### Bug Fixes
 - Mitigation fix for stale bonsai code storage leading to log rolling issues on contract recreates [#4906](https://github.com/hyperledger/besu/pull/4906)
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
@ -16,6 +16,9 @@ package org.hyperledger.besu.tests.acceptance.dsl.node.configuration;

 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.Collections.singletonList;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_JKS;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS11;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12;

 import org.hyperledger.besu.cli.config.NetworkName;
 import org.hyperledger.besu.crypto.KeyPair;
@ -34,7 +37,6 @@ import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
-import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki.PKCS11Utils;

@ -366,38 +368,38 @@ public class BesuNodeConfigurationBuilder {
    final TLSConfiguration.Builder builder = TLSConfiguration.Builder.tlsConfiguration();
    try {
      final String nsspin = "/pki-certs/%s/nsspin.txt";
-      final String truststore = "/pki-certs/%s/truststore.jks";
-      final String crl = "/pki-certs/%s/crl.pem";
+      final String truststore = "/pki-certs/%s/truststore.p12";
+      final String crl = "/pki-certs/crl/crl.pem";
      switch (type) {
-        case KeyStoreWrapper.KEYSTORE_TYPE_JKS:
+        case KEYSTORE_TYPE_JKS:
          builder
              .withKeyStoreType(type)
-              .withKeyStorePath(toPath(String.format("/pki-certs/%s/keystore.jks", name)))
+              .withKeyStorePath(toPath(String.format("/pki-certs/%s/%<s.jks", name)))
              .withKeyStorePasswordSupplier(
                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
              .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
-              .withTrustStoreType(type)
+              .withTrustStoreType(KEYSTORE_TYPE_PKCS12)
              .withTrustStorePath(toPath(String.format(truststore, name)))
              .withTrustStorePasswordSupplier(
                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
              .withTrustStorePasswordPath(toPath(String.format(nsspin, name)))
-              .withCrlPath(toPath(String.format(crl, name)));
+              .withCrlPath(toPath(crl));
          break;
-        case KeyStoreWrapper.KEYSTORE_TYPE_PKCS12:
+        case KEYSTORE_TYPE_PKCS12:
          builder
              .withKeyStoreType(type)
-              .withKeyStorePath(toPath(String.format("/pki-certs/%s/keys.p12", name)))
+              .withKeyStorePath(toPath(String.format("/pki-certs/%s/%<s.p12", name)))
              .withKeyStorePasswordSupplier(
                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
              .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
-              .withTrustStoreType(KeyStoreWrapper.KEYSTORE_TYPE_JKS)
+              .withTrustStoreType(KEYSTORE_TYPE_PKCS12)
              .withTrustStorePath(toPath(String.format(truststore, name)))
              .withTrustStorePasswordSupplier(
                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
              .withTrustStorePasswordPath(toPath(String.format(nsspin, name)))
-              .withCrlPath(toPath(String.format(crl, name)));
+              .withCrlPath(toPath(crl));
          break;
-        case KeyStoreWrapper.KEYSTORE_TYPE_PKCS11:
+        case KEYSTORE_TYPE_PKCS11:
          builder
              .withKeyStoreType(type)
              .withKeyStorePath(
@ -406,7 +408,7 @@ public class BesuNodeConfigurationBuilder {
              .withKeyStorePasswordSupplier(
                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
              .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
-              .withCrlPath(toPath(String.format(crl, name)));
+              .withCrlPath(toPath(crl));
          break;
      }
    } catch (Exception e) {
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java
@ -16,29 +16,36 @@
 package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki;

 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
-
-import com.google.common.base.Charsets;
+import java.util.Properties;

 public class PKCS11Utils {

  public static Path initNSSConfigFile(final Path srcFilePath) {
-    Path ret = null;
-    try {
-      final String content = Files.readString(srcFilePath);
-      final String updated =
-          content.replaceAll(
-              "(nssSecmodDirectory\\W*)(\\.\\/.*)",
-              "$1".concat(srcFilePath.toAbsolutePath().toString().replace("nss.cfg", "nssdb")));
-      final Path targetFilePath = createTemporaryFile("nsscfg");
-      Files.write(targetFilePath, updated.getBytes(Charsets.UTF_8));
-      ret = targetFilePath;
-    } catch (IOException e) {
-      throw new RuntimeException("Error populating nss config file", e);
+    // load nss file as Properties
+    final Properties nssProp = new Properties();
+    try (InputStream input = new FileInputStream(srcFilePath.toFile())) {
+      nssProp.load(input);
+      String nssDbPath = srcFilePath.getParent().resolve("nssdb").toAbsolutePath().toString();
+      nssProp.setProperty("nssSecmodDirectory", nssDbPath);
+    } catch (final IOException e) {
+      throw new UncheckedIOException(e);
    }
-    return ret;
+
+    // store modified config into temporary file
+    final Path targetFilePath = createTemporaryFile("nsscfg");
+    try (FileOutputStream outputStream = new FileOutputStream(targetFilePath.toFile())) {
+      nssProp.store(outputStream, null);
+    } catch (final IOException e) {
+      throw new UncheckedIOException(e);
+    }
+
+    return targetFilePath;
  }

  private static Path createTemporaryFile(final String suffix) {
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java
@ -24,6 +24,7 @@ import static org.hyperledger.besu.pki.util.TestCertificateUtils.issueCertificat

 import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+import org.hyperledger.besu.pki.util.TestCertificateUtils;

 import java.io.FileOutputStream;
 import java.io.IOException;
@ -46,8 +47,8 @@ public class PkiKeystoreConfigurationFactory {
  */
  final String NSSCONFIG_PATH_STRING = "/pki-certs/%s/nss.cfg";
  final String NSSPIN_PATH_STRING = "/pki-certs/%s/nsspin.txt";
-  final String TRUSTSTORE_PATH_STRING = "/pki-certs/%s/truststore.jks";
-  final String CRL_PATH_STRING = "/pki-certs/%s/crl.pem";
+  final String TRUSTSTORE_PATH_STRING = "/pki-certs/%s/truststore.p12";
+  final String CRL_PATH_STRING = "/pki-certs/crl/crl.pem";

  /*
   Software keystore config
@ -78,10 +79,10 @@ public class PkiKeystoreConfigurationFactory {
              PKCS11Utils.initNSSConfigFile(
                  readResourceAsPath(String.format(NSSCONFIG_PATH_STRING, name))))
          .withKeyStorePasswordPath(readResourceAsPath(String.format(NSSPIN_PATH_STRING, name)))
-          .withTrustStoreType(KeyStoreWrapper.KEYSTORE_TYPE_JKS)
+          .withTrustStoreType(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12)
          .withTrustStorePath(readResourceAsPath(String.format(TRUSTSTORE_PATH_STRING, name)))
          .withTrustStorePasswordPath(readResourceAsPath(String.format(NSSPIN_PATH_STRING, name)))
-          .withCrlFilePath(readResourceAsPath(String.format(CRL_PATH_STRING, name)))
+          .withCrlFilePath(readResourceAsPath(CRL_PATH_STRING))
          .withCertificateAlias(name);

    } catch (Exception e) {
@ -113,7 +114,7 @@ public class PkiKeystoreConfigurationFactory {
    // Only create the truststore if this is the first time this method is being called
    if (caKeyPair == null) {
      try {
-        caKeyPair = createKeyPair();
+        caKeyPair = createKeyPair(TestCertificateUtils.Algorithm.RSA);
        caCertificate = createSelfSignedCertificate("ca", notBefore(), notAfter(), caKeyPair);

        final KeyStore truststore = KeyStore.getInstance(type);
@ -136,7 +137,7 @@ public class PkiKeystoreConfigurationFactory {
      createTrustStore(type);
    }

-    final KeyPair kp = createKeyPair();
+    final KeyPair kp = createKeyPair(TestCertificateUtils.Algorithm.RSA);
    final X509Certificate certificate =
        issueCertificate(caCertificate, caKeyPair, "validator", notBefore(), notAfter(), kp, false);

--- a/acceptance-tests/tests/src/test/resources/pki-certs/README.md
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/README.md
@ -0,0 +1,127 @@
+See `ethereum/p2p/src/test/resources/keys/README.md` which describes the details on how the 
+certificates are created. The same CA are used to create miner1-miner6. 
+
+For `PkiQbftAcceptanceTest`: 
+`miner1`-`miner5` are signed with `partner1_ca` and `miner6` is signed with `partner2_ca`.
+`miner5` and `miner6` are revoked and added in the crl list.
+
+Sample shell script that can be executed to recreate the certificates
+~~~
+#! /bin/sh
+
+names=("partner1:miner1" "partner1:miner2" "partner1:miner3" "partner1:miner4" "partner1:miner5" "partner2:miner6")
+crls=("partner1:miner5" "partner2:miner6")
+KEY_ALG="EC -groupname secp256r1"
+#KEY_ALG="RSA -keysize 2048"
+
+##########
+CA_CERTS_PATH=./ca_certs
+ROOT_CA_KS=$CA_CERTS_PATH/root_ca.p12
+INTER_CA_KS=$CA_CERTS_PATH/inter_ca.p12
+CRL_DIR=./crl
+
+keytool -exportcert -keystore $ROOT_CA_KS -storepass test123 -alias root_ca -rfc -file $CA_CERTS_PATH/root_ca.pem
+
+echo "Generating miner keystores..."
+### Generate client keystores
+for name in "${names[@]}"
+do
+  IFS=':' read -r -a array <<< "$name"
+  partner=${array[0]}
+  client=${array[1]}
+
+  PARTNER_CA_KEYSTORE="$CA_CERTS_PATH/${partner}_ca.p12"
+  CLIENT_PATH="./${client}"
+  KEYSTORE_PATH="./$CLIENT_PATH/${client}.p12"
+  NSSDB_PATH="${CLIENT_PATH}/nssdb"
+
+  echo "$PARTNER_CA_KEYSTORE"
+
+  mkdir -p $NSSDB_PATH
+
+  echo "Generating keystore for Partner $partner Client $client"
+  keytool -genkeypair -keystore $KEYSTORE_PATH -storepass test123 -alias ${client} \
+  -keyalg $KEY_ALG -validity 36500 \
+  -dname "CN=localhost, OU=${partner}" \
+  -ext san=dns:localhost,ip:127.0.0.1
+
+  echo "Creating CSR for $client and signing it with ${partner}_ca"
+  keytool -storepass test123 -keystore $KEYSTORE_PATH -certreq -alias ${client} \
+  | keytool -storepass test123 -keystore $PARTNER_CA_KEYSTORE -gencert -alias "${partner}_ca" -ext ku:c=digitalSignature,nonRepudiation,keyEncipherment -ext eku=sA,cA \
+  -rfc > "${CLIENT_PATH}/${client}.pem"
+
+  echo "Concat root_ca.pem to ${client}.pem"
+  cat "${CA_CERTS_PATH}/root_ca.pem" >> "${CLIENT_PATH}/${client}.pem"
+
+  echo "Importing signed $client.pem CSR into $KEYSTORE_PATH"
+  keytool -keystore $KEYSTORE_PATH -importcert -alias $client \
+  -storepass test123 -noprompt -file "${CLIENT_PATH}/${client}.pem"
+
+  echo "Converting p12 to jks"
+  keytool -importkeystore -srckeystore $KEYSTORE_PATH -srcstoretype PKCS12 -destkeystore "$CLIENT_PATH/${client}.jks"  -deststoretype JKS -srcstorepass test123 -deststorepass test123 -srcalias $client -destalias $client -srckeypass test123 -destkeypass test123 -noprompt
+
+  echo "Initialize nss"
+  echo "test123" > ${CLIENT_PATH}/nsspin.txt
+  certutil -N -d sql:${NSSDB_PATH} -f "${CLIENT_PATH}/nsspin.txt"
+  # hack to make Java SunPKCS11 work with new sql version of nssdb
+  touch ${NSSDB_PATH}/secmod.db
+
+  pk12util -i $KEYSTORE_PATH -d sql:${NSSDB_PATH} -k ${CLIENT_PATH}/nsspin.txt -W test123
+  echo "Fixing truststores in sql:${NSSDB_PATH}"
+  certutil -M -n "CN=root.ca.besu.com"       -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+  certutil -M -n "CN=inter.ca.besu.com"      -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+  certutil -M -n "CN=${partner}.ca.besu.com" -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+
+  certutil -d sql:"$NSSDB_PATH" -f nsspin.txt -L
+
+  echo "Creating pkcs11 nss config file"
+  cat <<EOF >${CLIENT_PATH}/nss.cfg
+name = NSScrypto-${partner}-${client}
+nssSecmodDirectory = ./src/test/resources/pki-certs/${client}/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
+EOF
+
+  # remove pem files
+  rm "${CLIENT_PATH}/${client}.pem"
+
+  # create truststore
+  echo "Creating truststore ..."
+  keytool -exportcert -keystore $ROOT_CA_KS  -storepass test123 -alias root_ca -rfc   | keytool -import -trustcacerts -alias root_ca -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+  keytool -exportcert -keystore $INTER_CA_KS -storepass test123 -alias inter_ca -rfc | keytool -import -trustcacerts -alias inter_ca -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+  keytool -exportcert -keystore $PARTNER_CA_KEYSTORE  -storepass test123 -alias "${partner}_ca" -rfc   | keytool -import -trustcacerts -alias "${partner}_ca" -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+
+done
+rm $CA_CERTS_PATH/root_ca.pem
+echo "Keystores and nss database created"
+
+## create crl list
+mkdir -p $CRL_DIR
+rm $CRL_DIR/crl.pem
+
+for crl in "${crls[@]}"
+do
+  IFS=':' read -r -a array <<< "$crl"
+  partner=${array[0]}
+  client=${array[1]}
+
+  echo "Exporting CA certificate and private key"
+  openssl pkcs12 -nodes -in "$CA_CERTS_PATH/${partner}_ca.p12" -out "$CRL_DIR/${partner}_ca_key.pem" -passin pass:test123 -nocerts
+  openssl pkcs12 -nodes -in "$CA_CERTS_PATH/${partner}_ca.p12" -out "$CRL_DIR/${partner}_ca.pem" -passin pass:test123 -nokeys
+
+  echo "Export $client certificate"
+  openssl pkcs12 -nodes -in "./${client}/${client}.p12" -out "$CRL_DIR/${client}.pem" -passin pass:test123 -nokeys
+
+  ## On Mac, use gnutls-certtool, on Linux use certtool
+  echo "Creating crl"
+  printf '365\n\n' | gnutls-certtool --generate-crl --load-ca-privkey "$CRL_DIR/${partner}_ca_key.pem" --load-ca-certificate "$CRL_DIR/${partner}_ca.pem" \
+  --load-certificate "$CRL_DIR/${client}.pem" >> $CRL_DIR/crl.pem
+
+  rm "$CRL_DIR/${partner}_ca_key.pem"
+  rm "$CRL_DIR/${partner}_ca.pem"
+  rm "$CRL_DIR/${client}.pem"
+
+done
+
+~~~
--- a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/inter_ca.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/inter_ca.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner1_ca.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner1_ca.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner2_ca.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner2_ca.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/root_ca.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/root_ca.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem
@ -0,0 +1,26 @@
+-----BEGIN X509 CRL-----
+MIICCTCB8gIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMS5j
+YS5iZXN1LmNvbRcNMjMwMjAyMDcyODAyWhcNMjQwMjAyMDcyODAyWjBcMBUCBGPB
+QSgXDTIzMDIwMjA3MjgwMlowFQIEEevs6RcNMjMwMjAyMDcyODAyWjAVAgQsaU0G
+Fw0yMzAyMDIwNzI4MDJaMBUCBG2UiBoXDTIzMDIwMjA3MjgwMlqgQTA/MB8GA1Ud
+IwQYMBaAFBIuwtMGbq3lv8zRoPbkRVU3C7+cMBwGA1UdFAQVAhNj22YCCfR6KAr3
+Jz9Wf/uqHx6QMA0GCSqGSIb3DQEBCwUAA4IBAQBfprxahWbxzS/+Wl7E9u8TSn1s
+Wu2bigQb7iN5zeL6t/8JQ514Y3MR88AZ3O3Wk4QyLOl+0iwxvg7cp7CJQtGYbU3X
+wsYGESYwQZmTxRqsTj6+ZdmHRCeYzKz/GyM+L0SJfvQrZhlOPI45xrnKgMq5PFfD
+UMhZOX/QS8XZB0z0RHiGICcYZo0MAB6MLy3svTzWfulCR23BA+V1R15iHFCWqdyV
+newrb6LFqz2ZEj0j6NsBdoqLzsFnkfyyPRYNbhfO4zTrsgzO5vA0894St9Rob6K8
+rYo8NzXVPe/GCcLDpczdNsYdyrlVIJVIyPhwX6sqs+MiM5Tv1YOR08n9QMCC
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICCTCB8gIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMi5j
+YS5iZXN1LmNvbRcNMjMwMjAyMDcyODAyWhcNMjQwMjAyMDcyODAyWjBcMBUCBCHr
+jx0XDTIzMDIwMjA3MjgwMlowFQIEet0CHBcNMjMwMjAyMDcyODAyWjAVAgQsaU0G
+Fw0yMzAyMDIwNzI4MDJaMBUCBG2UiBoXDTIzMDIwMjA3MjgwMlqgQTA/MB8GA1Ud
+IwQYMBaAFD9/xcIxAL/W332b3jmJ/oCeelKZMBwGA1UdFAQVAhNj22YCDSFMMJWc
+DYJaDxyk5/lTMA0GCSqGSIb3DQEBCwUAA4IBAQA4fpbGGXVx8UZH4X41MQfbsQj3
+IsTO6KRpHEKTgQwZmyVy8+Ot6qJ3j9NOOgDyUzh8J/4F8dwlhtCrtfQuaVJdS3ny
+hZNiMmWUqfGZmMasEk9pmzjvgh4tW9osls1HuirAavxxrSLVHWeJjbQQ11/Mrv1a
+xA60gf7I+qM9naO4SjB+wQR8F6wzudtrmQ0EvxzxL68wXSSYN7P7zPcd2mGjwKvs
+tr3YacPMRmTi3IDLNhx0aIWmKYuyoKIYzm1gv0jlDwembPKp9c2Ps6RK0ahPut7s
+cgpWnsNN88zPeLmrPhUcb4/T45bTZ80d028Ix3U36Gh0TaOgrERkvVE3ViqP
+-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem
@ -1,27 +0,0 @@
-----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
-MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
-QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
-FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
-AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
-p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
-3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
-4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
-0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
-Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
-dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
-YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
-AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
-XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
-KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
-s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
-EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
-mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
-hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
-ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg
@ -1,6 +1,5 @@
-
-name = NSScrypto-miner1
+name = NSScrypto-partner1-miner1
 nssSecmodDirectory = ./src/test/resources/pki-certs/miner1/nssdb
 nssDbMode = readOnly
 nssModule = keystore
-    
+showInfo = true
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert8.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert8.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert9.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert9.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key3.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key3.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key4.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key4.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/pkcs11.txt
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/pkcs11.txt
@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner1/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl-ca.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl-ca.pem
@ -1,70 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
-MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
-B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
-6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
-rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
-cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
-plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
-ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
-/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
-WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
-qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
-cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
-+6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
-NaI0qQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem
@ -1,126 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDZQxht9bs0mIra
-bxzfQzBl0KJZ1dp1lpt2HIZ7YyWHHcS4fCgiJi6BzROakLfK808AefV/6OSoj6P0
-eN5x3E/1CW6DpWAx8FdxJopS1fwlcrERee9524G2KA9/EY3Acbvx32vIPqNBzbzW
-6o0wfBYerY+QEQmYopBB9KrutRLVJTqaMRnZTRRk3B1mwofQTWTja5NPR+pparBK
-JvdkfRPdabMXQNxO3sLhLGsXpZzLzMq2HrxZItE8U92I4Tz+VSXk0+Yl+n8CJPCj
-8VzonyVZf2lrj0y4ty3GFuO9/7tLF+Edhf0LwX9zRrPwutsuRFDTpE0ixf0as7nL
-Qqj4EDejAgMBAAECggEAT9uKqjhNhEqhlyKKUUIoEvR6CF1DvD8Mi4B2qfnKfHyj
-p0/zjIHOTGWt0/1noRCHtFwfsdFP4ulRUXXwBZf+R8octgTec9yst2l8JHCFCtq6
-XPsd3AOkDOlysLkqCleDxqbhvivP5EsUI0b5eJ3Tn5kaENFCXrk6HxQolC84aeFk
-471bl7Wamqh7vOWNYpf4bBjWeqhJ0m0LwGfuqDdZ91Kz6sB/Yqk6O9gMT/GjiPX7
-7a4U7HB+uHxWKZRxvQxs59ZX0xhamptnrggMleS+QoCndYdccD2R+ibGoZ6585d+
-a3NEBi//T4WFFhgsJx8oshRb2OUSF1kqQJKbb85M4QKBgQDufpxN5YFZfiI0xEp7
-329jU2s7EB+0cVNC08rRlYcUvkJ/BOcViREt3qwpq5eB4b3zMBUkCuHP1jBAECha
-V2rDUFkHVh9tHl/FQhbCUzT+h3f3MTDXa4E8ekvFi4hWsCALkdgneCObrAcc6lGQ
-Jq1uNIRFh9l0aVDRZ6YI9mgOcQKBgQDpNYUN31uGL/JzwIUNKVYwiMWk7X/sUIso
-EnpL6oyX7zpMTAfx8xRMBWDD7MXgkHQ826lDWIli0bqW9Tw+2U7rXwsg2w4Swva4
-qAdRGMZR+aCNspCu14DMdE6h8GSWWSCkiIatrVWhNtuPSuFFrlafyMMbElUrimGw
-nAMdO9KZUwKBgDB8tTJxEpcrObEYpzv/9RlwgECFyqxYzeCsRnPNvqTM+Z/xUznh
-oAh/WOkv5aGWT5P9lo65V6d1mGGt50ZWt3H2B+Oh8smwfzAPe6kOWZvV1uH+sjtZ
-s/CjvHvxHkrhi+JOSG/d0P95Pgj26pYwBtp8+tdYAzHTp4arV+pCjm1BAoGAc6ui
-FSFmCgaaISOqWr7YCzaroYRTYOkKPJP9qM3rciisJ8/GWRGSTaqVNlioRRwhK1Zg
-fBDcA/G2tM1qVln+tOvtXxyHvHKLYUemaWj6ZQqFwgKBlNc7AS3nGpdbrN8EO9ej
-xV0mDdJh0I75cVBpktNHQpQzPmdi0PBw8v0LFhUCgYEA6W3OfDgb9E0UqnQdRgr1
-i/EOj7tVIc7oFep7IkK8NL68oNclcfwwzbcUVd0nN3HpHVHj/effg+Ep9s0jxqdj
-LD5iQeuXVMZK8jpO7FSnUej86IoFFU1i++ijzSd6nJdG2qxfWHOo/VOWaTeFYFv7
-L9uPPJswMxwWXSeu00alFLE=
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIIEtTCCA52gAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zcwDQYJKoZIhvcNAQEL
-BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
-CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
-MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
-MTkxMjA2WhgPMjEyMTA2MTUxOTEyMDZaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEP
-MA0GA1UEAwwGbWluZXIxMSIwIAYJKoZIhvcNAQkBFhNtaW5lcjFAcGFydG5lcmEu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UMYbfW7NJiK2m8c
-30MwZdCiWdXadZabdhyGe2Mlhx3EuHwoIiYugc0TmpC3yvNPAHn1f+jkqI+j9Hje
-cdxP9Qlug6VgMfBXcSaKUtX8JXKxEXnveduBtigPfxGNwHG78d9ryD6jQc281uqN
-MHwWHq2PkBEJmKKQQfSq7rUS1SU6mjEZ2U0UZNwdZsKH0E1k42uTT0fqaWqwSib3
-ZH0T3WmzF0DcTt7C4SxrF6Wcy8zKth68WSLRPFPdiOE8/lUl5NPmJfp/AiTwo/Fc
-6J8lWX9pa49MuLctxhbjvf+7SxfhHYX9C8F/c0az8LrbLkRQ06RNIsX9GrO5y0Ko
-+BA3owIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1UdDgQWBBRV
-r9dQp8+r8/Z2l9lga+bsOUc7bTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCBqoAUIaZG
-YPiraoerBQo7ZvRxPvWyyd2hfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD
-QTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4G
-A1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb22C
-FHAEyPzePSbGcgLskvIH1ugaaXQRMA0GCSqGSIb3DQEBCwUAA4IBAQAFDFHIs05g
-vj8PBOmJ+FqBJSDB0Xt/XOzKBspVIjLuQaRagFR9tg/h2CZC2QcWSmDcNSFyjehh
-8NMZMwLllsAQJSz29eBbS4lg18FFrRhqVSGvB6l0hgMmaXt0xe4sCcW2yCB/Hl9w
-s0wVByqTW1uyBM1iRCRQ7sApeutZMb1kcjLletpH4ZySLe94xiKdaOZ4UEgxELEn
-LuT1ibAAPcmwhHY4Rx53G/IgwtK+bIP+bJS0GUwOaCFjvp6ECFw0SWrJA6WTI/Ag
-2JwlJDjq9kaXXrTtWywvAt6DrPozKb2nBnOQsLQ5ZDBKRmBZ7E9IXIG9TvBNetH0
-2ULmPk+4o5Aw
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
-MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
-B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
-6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
-rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
-cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
-plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
-ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
-/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
-WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
-qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
-cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
-+6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
-NaI0qQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem
@ -1,27 +0,0 @@
-----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
-MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
-QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
-FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
-AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
-p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
-3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
-4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
-0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
-Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
-dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
-YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
-AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
-XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
-KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
-s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
-EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
-mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
-hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
-ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg
@ -1,6 +1,5 @@
-
-name = NSScrypto-miner2
+name = NSScrypto-partner1-miner2
 nssSecmodDirectory = ./src/test/resources/pki-certs/miner2/nssdb
 nssDbMode = readOnly
 nssModule = keystore
-    
+showInfo = true
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert8.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert8.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert9.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert9.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key3.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key3.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key4.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key4.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/pkcs11.txt
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/pkcs11.txt
@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner2/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl-ca.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl-ca.pem
@ -1,70 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBIwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMTFaGA8y
-MTIxMDYxNTE5MTIxMVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTP8IviC0X2ozlU2+
-9+mPLL9NqJKRCsEiH7XypcXkqkzCYZv/+6nNWXGLr6HsF5qXaM/YVMJYtwiaJquw
-qW1CpOKxhHA1gubNt0Fzmt69/5yP6D1zxTPzAcybNMuCy8VcLJpovYHO40+2HD6I
-D91/zh3jtrgKPoEXgaW3eX4+hykQWaru3P/G4PrIvPyZXnccoCdBSRCqyZSBJUko
-e5ZLnCQMlkwgDONGT3MqQyUC5lqFFMzZ75pOm2reiBe6HzP3H4wK7Ldpxds9ubGk
-Acb08+QzcUT7uHvENyvLm5mbf68QurFTwIDEVg2K03dgqQWbJudSzRJAmJYSszFQ
-vLZdAgMBAAGjZjBkMB0GA1UdDgQWBBR5aiJ1nA1HHi0XzbRsp4V7T8eKBjAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAsmFsG3SV1fQg6kO+
-dYvFrDKNOJzTBdVYmFhg4y4H7Qt+dwQcs/ZcOCIaAFUfMUH6CWe1AAdCymfwUHxn
-l/FMeJHh/+d1cybC+Wj9wtBbz7nPsWh/PXbbg3Zi8N4+a6Y0NhZAGlNn1UgMHx+E
-SkSIXk63FkGT01xM2aYtfr9ABuDdoLK/YPecduiawZoRb02WwIpZFNeEE/MS7XG6
-fX9TdUrNOal8pnWUM79K+rzdlzstpCx7uFFbACUEiiIuYiqG6X+DuypfGmQnjRXB
-zbc6NsQONUxg7fnJObdpV7kKTlbpREFoECkTBdqKd7AuJwYRvGaQDWK9P1IYFr1W
-Cnm4Cg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem
@ -1,126 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9KKwHqcqiRo+b
-J5ttXc3BoPGmpNrJt5esQEHJDgOEiBdaOnynJZp6St95BTcSbdJM32OwVEdTVa5L
-sMVWELjuoRYn8VTaLfycVTh2avkTz6x+KWnv6hrTdPe2Spgl4R5tWS1DpF2XP71N
-uXCo5OoDuGwIrbhkomnZy/+5lIj+O5NS/kIZAKBpJy6OBGPMUmHBAuQS14zKfLpC
-792IDxg8TQVvCdCCnm0Jnntr+z8WJ7yP4jQnB3C3xsJ/Kus+soQ7f1uDfeo319dY
-rmMz0STH5Fa1tSlFHmk5mh8C7rgxwQRvluowiMwD+jc/BQIseirGYOojXkkwxGZc
-TEu9hd3zAgMBAAECggEAJoU70yuuijFYWT5Nlo39sqq1yzvTGjT6/CbxvqHN8ZVN
-PCCg9eDgfnr0205GksguhV0Qjf37sGrIXb2X0hkBsAa53lR09SFcSfHI18SdCH3I
-IMEKQ8Mmx10QfNzf8wbPDXGVmCrGrGBcipFy8dH8HdnWlkXaQRQZ/jJe10n6Q9tA
-GM7hf59IuO5519M/qcSt8Zc3Z2ENd3WMLKcgk4fWjWwUD5Aa9K4UIK0sTBRda7vy
-m8vlJlRnko0K8q5gh+xIeLWEKQxM1UwosmPjTO/IvwaKZqznJahz+nc+aDe8eZM5
-XQ72mM7zCx8tCFrsLIJhhIwc01ybY+FniUb0Icmt8QKBgQDtZ0My6C962jkF6tCV
-3m14afcE4DyjHc4gx+y2ByO37cURNicCiaI5VOUZ+Vc9htx6dGU1bz9fv8r10fVF
-c1FMvkUkiI/HoKK/l07RiCNXFd9oB+Q+yFFoWKjFyTV+1rS6lOQ1RVMjziKwdG7g
-PzuwwX/JiRqWgyz5TA7WRwykpwKBgQDL+fHf/m49JdRdEyBTVpTt0sjyXjc6YbM/
-oRUVuoiWpMxxXvpPvc8IVzULy9yQRTANSSGYSGuwUAQiTzGE/OQ4gYY8ElyMNpbE
-OjURcZ0yur3ROxWDbqb9+9m8+yZa5guA0udswuXwwSLBJryQCoE6jEV/mdChmNJT
-RSJPC/EJ1QKBgQCmZI/26EIPC1CYUyJrSIDVuv+FjV0yvrswwq+oTYy9Z4uOKrRg
-1PK82EHTWK3K0/FIarhdIWH7zEOG0+fjC5ZaAaoYlxafRnmLa5O0zIRoj04MbiuN
-zX0xc6KnLgWupvH5LE5e//3rxJkPsCveRLOjiZv1N4FJKRumh6aGjTnRVQKBgGzS
-SCyMfRu6VvXhAlnz0zieP/6uLSDEhvDna2xQPBbCjR/e4AQy64UzoWVNubpubxhn
-b7jiyjEiP1JelbixgsByub7KvP1BEmZV94H67zblUeeScgPQwN63wo6EHw5XtMNh
-wX3Q7QPoxjXuCKOANzmZJGrTEO9lrLAoLgmmAU6RAoGBAIohXQJHb7Uayo0nX8fy
-tpBWaciixd5jYWsrwugkZu1wUOmPZC05o0sGEVk+xKLaBaGa6aDbLD6LsvJcFQjQ
-3B8y2/XvOeVh9bHdGJ+dQRM2RMqe2xc1NIEG4qrU8w31GyYwVSmXIAhJ/4iVLNiO
-xQ6XhvyeIleOJcGW40Uqj37u
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIIEtTCCA52gAwIBAgIUE2YQ4Gyrr1+4i0VAQU4llwTyjNUwDQYJKoZIhvcNAQEL
-BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
-CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmJjYTEm
-MCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5jb20wIBcNMjEwNzA5
-MTkxMjEzWhgPMjEyMTA2MTUxOTEyMTNaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEP
-MA0GA1UEAwwGbWluZXIyMSIwIAYJKoZIhvcNAQkBFhNtaW5lcjJAcGFydG5lcmIu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvSisB6nKokaPmyeb
-bV3NwaDxpqTaybeXrEBByQ4DhIgXWjp8pyWaekrfeQU3Em3STN9jsFRHU1WuS7DF
-VhC47qEWJ/FU2i38nFU4dmr5E8+sfilp7+oa03T3tkqYJeEebVktQ6Rdlz+9Tblw
-qOTqA7hsCK24ZKJp2cv/uZSI/juTUv5CGQCgaScujgRjzFJhwQLkEteMyny6Qu/d
-iA8YPE0FbwnQgp5tCZ57a/s/Fie8j+I0Jwdwt8bCfyrrPrKEO39bg33qN9fXWK5j
-M9Ekx+RWtbUpRR5pOZofAu64McEEb5bqMIjMA/o3PwUCLHoqxmDqI15JMMRmXExL
-vYXd8wIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1UdDgQWBBSM
-DZd7TOnlvZgf9xDky+I9GLXRyzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCBqoAUeWoi
-dZwNRx4tF820bKeFe0/HigahfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD
-QTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4G
-A1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb22C
-FHAEyPzePSbGcgLskvIH1ugaaXQSMA0GCSqGSIb3DQEBCwUAA4IBAQDI9Gs1TKns
-D8fJJCjX0Q9qtoP8X0HEA3iqMOaB3oQMxE9EU+Bc+6K7dnKcjYF+lqQlj+WDcLqh
-AlJ4qH8UyghepPimLWin9o4KOPuaZ3CkJ1yXnOKCsbj4r7T/5CgJt7vN4RYq6Y6Z
-rm7et2Z5OeB4NlfMEvmbtkiIky5qamJWjXZMW93mJqG0gpWXol+TvwLcr8E46hh3
-HBVcOzUzaUhBYX12RSLwfwF5XI3LaHTZZDhP0hdzEuPtVrU9qkcg+KaLHmsRe+h3
-7QLWvp1wG+A7onnvUQv0iPqjH5r0koQZ27zyn/O5u+pNOVNV/SDjsj0Fs2eyLXe1
-Ca8j0RT9TqjZ
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBIwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMTFaGA8y
-MTIxMDYxNTE5MTIxMVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTP8IviC0X2ozlU2+
-9+mPLL9NqJKRCsEiH7XypcXkqkzCYZv/+6nNWXGLr6HsF5qXaM/YVMJYtwiaJquw
-qW1CpOKxhHA1gubNt0Fzmt69/5yP6D1zxTPzAcybNMuCy8VcLJpovYHO40+2HD6I
-D91/zh3jtrgKPoEXgaW3eX4+hykQWaru3P/G4PrIvPyZXnccoCdBSRCqyZSBJUko
-e5ZLnCQMlkwgDONGT3MqQyUC5lqFFMzZ75pOm2reiBe6HzP3H4wK7Ldpxds9ubGk
-Acb08+QzcUT7uHvENyvLm5mbf68QurFTwIDEVg2K03dgqQWbJudSzRJAmJYSszFQ
-vLZdAgMBAAGjZjBkMB0GA1UdDgQWBBR5aiJ1nA1HHi0XzbRsp4V7T8eKBjAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAsmFsG3SV1fQg6kO+
-dYvFrDKNOJzTBdVYmFhg4y4H7Qt+dwQcs/ZcOCIaAFUfMUH6CWe1AAdCymfwUHxn
-l/FMeJHh/+d1cybC+Wj9wtBbz7nPsWh/PXbbg3Zi8N4+a6Y0NhZAGlNn1UgMHx+E
-SkSIXk63FkGT01xM2aYtfr9ABuDdoLK/YPecduiawZoRb02WwIpZFNeEE/MS7XG6
-fX9TdUrNOal8pnWUM79K+rzdlzstpCx7uFFbACUEiiIuYiqG6X+DuypfGmQnjRXB
-zbc6NsQONUxg7fnJObdpV7kKTlbpREFoECkTBdqKd7AuJwYRvGaQDWK9P1IYFr1W
-Cnm4Cg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem
@ -1,27 +0,0 @@
-----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
-MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
-QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
-FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
-AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
-p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
-3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
-4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
-0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
-Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
-dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
-YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
-AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
-XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
-KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
-s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
-EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
-mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
-hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
-ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg
@ -1,6 +1,5 @@
-
-name = NSScrypto-miner3
+name = NSScrypto-partner1-miner3
 nssSecmodDirectory = ./src/test/resources/pki-certs/miner3/nssdb
 nssDbMode = readOnly
 nssModule = keystore
-    
+showInfo = true
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert8.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert8.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert9.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert9.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key3.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key3.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key4.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key4.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/pkcs11.txt
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/pkcs11.txt
@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner3/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl-ca.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl-ca.pem
@ -1,70 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBMwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMThaGA8y
-MTIxMDYxNTE5MTIxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmNjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmNjYUBwYXJ0bmVyYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+31Xz+vdtagGGF4Zs
-JPzLNkPRWUZ2aB2nB6O3GFFItRERIeKQQ809jpuWb+3nPwmHgAeu/5KDuHExXUp3
-zsq/pBhjmIxysN/tSB0ZWgnDZj0T/O1cFxmFPSIQi2YqN9ex/k1P0A/bPLYid6sp
-BrMB2oDuemjG9OL8zwWxTWFstwMZgh+PUoLv4xPt3vnv8hiBvMxIRe2IjseFRvR9
-zoaxAW94oeLPngPgWanUZvU+hL0BR2h0RZbsmPciw4K7PzHKCfOnDcJN3/k32GuQ
-1ETYXVqBZstMwZ/yUAZzHDUFuungfM/VyuVVqjV1Njmi1ulrZNaLj3pe+x0WwrXq
-VbgfAgMBAAGjZjBkMB0GA1UdDgQWBBRoOd/JgcA/UZW816OxlkI45xhLJDAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAbIUXWJ1SU2cwnGfJ
-gor9Y3QX8q3bLRBQ6nuVXUhyHtOKnecEYY+6cvTgAy4tcaEbTrmXnIwwddzWXR5c
-IEgpem6t9tJqjvDZ3SMmlIf57L/rKp1rQQXmOBm2fBy86zC6RChYMshf9LQ3pCeZ
-kESZ+WzHqmTDe2vpe3AaZTsGy+HucyVv5Ha5WLATFMPSMbY76sMbFDEr8viskCNm
-JzDvYbqHMfZUJu4eiWiRJ8v6GY1HJ8SJrFUz2ry6WNYiizoEABHC8VrWV+Kss1Vq
-MiFfAZND4wBS5TZmaKi4BQt/+cnUAX0ej6wYSug/+Atz9DSu/b+AsEZ5tXnxDMGO
-vqwj8g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem
@ -1,126 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCol3pqUWbENqDT
-uNXBD3iDakHmP3RTH2UKwF32rhC8LMR5nfJF+5LR4LDmpZOrlhp+pjLczR+6w0cQ
-7o56VmkWcp3L31MTg0JsYZUahn1hwSV6OzHSnhqIRiv5jKYAJ1RrlfHzAN/XV6Sz
-FKn1pDXlz9HYs6ginChBtQsHpy4SOcOfuukZAB1+KcTco0wJDoPGaB5kvc7e/+uF
-rft1rUq9npu48WV90Q901bSRvjz3OYsqqrK6KeWxJGddbaPr5oPL73t6dOqxJnp/
-tUD3W7/3w0OdC7Zw/sSVfq8Xry1fG3oNuHzrf5pBNPzQY9BRRWfXApr6BgdCQlEx
-dFboHHhPAgMBAAECggEAbAx5Bj6ZUFN6i3bAd/UEVaT6CyjL0qIiTduv3PL+Arvm
-R9N0fGmZVS1d8tRXafbPkC/QFTbZiQayOyXI5psOyrY2b3z3b2AGaBO6Tb+4B7iT
-3lylt8hgVMo0UMFVem+6aSE2aXk7/HVNNwCdVLMjX9/rK6kortXJ7yKqqQL6Qe78
-n6g4j6NFA/r1U81N2fPI6y3afANtkuCdKdreRkiHy9KSyOk4lY7Wh7orN3DAuIDf
-SwNV3zUDQT2heX9qYqicu0reWp0KakvaDuSuR1I/QrMl7h7ims2ptpWwEWlM8opy
-H2zl/y2YPDubkpkY4beHv828PCZnp6lynQGdn9H/cQKBgQDdU9IxpRFbsjIG8R0E
-vuU95cI2h4HgwEYPcg6Tj0tyUJVYKdQGmVnptzj4qBm6PpB2e0VO8Dshz6eV8G8Q
-SYFvXO+3q+aPG4/VCuvHrUPaH6AK+3KoaFVgghOzioeshy7NB0W2RbZow5Av9Pso
-Fxe7gfWCnknOq1/2UBzwmICOiwKBgQDDALqTl08KgHnTEJoy6afx7pnNnsLsb5rW
-DU7g7SemfnQLLxUrgd1obZsO6oIfOEEs5RzzuUm/avKXrONxVN+LEPTbaN8lZ38w
-19ZsrEFgYi+Hd763mODzBna0kButSe2ZKAy2p2v+Ml9CD8jjKRLPVV8JD4tjt4KE
-MGQ4NlRZzQKBgQCWBcY5noEonZ4pdHBOEjODhGTj33Ba7xnOSGq2/O+QGi1RKHEu
-0+3NbUOx0Qg3ZUc4+I/fVRlP7tjS2rn92UViPiXDY0MSCAWzzAZMQBb5GGy8ZPqw
-SqBsnV9LWQBkIvHHSkGnrpNZag4nY7CG2TheAlZvZmnzK9kNNfqX31dsxwKBgQC7
-Gl3q80lxyCgb7lgl9a+hINEOTAC3n7YvIAHJK4PZ6ocpm/lyD18DrfcTbst/bRiM
-HSGUcPpj4hf2lHp+6XK8Gn72bz98wjt2AALLrtPjyRHVp32k59kfFdqcEZGcycxi
-Id1g/G9QLcDcwAx+eZCEw2M2bGXQPenLMCtZDDgPGQKBgQDAY7VTkywcPo3JHpJA
-v6/Su5hERcj8C3gh1ZT8z3eFKZORQVgVFo7ZkXATHJpvKBNOxcWl3wxWEzwcQkXT
-HZ67zkg3arnJp0pxGeDN9cu9QmNYF6gPt5uEX/bEKVm1+zDcC0JuJ0dZk0zCMrZP
-bfGCvhFx5SF5x1XGCvBO8RT8NA==
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIIEtTCCA52gAwIBAgIUeHwvCYkMzLzluPyGlFa5V/lmFnswDQYJKoZIhvcNAQEL
-BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
-CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmNjYTEm
-MCQGCSqGSIb3DQEJARYXcGFydG5lcmNjYUBwYXJ0bmVyYy5jb20wIBcNMjEwNzA5
-MTkxMjIxWhgPMjEyMTA2MTUxOTEyMjFaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEP
-MA0GA1UEAwwGbWluZXIzMSIwIAYJKoZIhvcNAQkBFhNtaW5lcjNAcGFydG5lcmMu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqJd6alFmxDag07jV
-wQ94g2pB5j90Ux9lCsBd9q4QvCzEeZ3yRfuS0eCw5qWTq5YafqYy3M0fusNHEO6O
-elZpFnKdy99TE4NCbGGVGoZ9YcElejsx0p4aiEYr+YymACdUa5Xx8wDf11eksxSp
-9aQ15c/R2LOoIpwoQbULB6cuEjnDn7rpGQAdfinE3KNMCQ6DxmgeZL3O3v/rha37
-da1KvZ6buPFlfdEPdNW0kb489zmLKqqyuinlsSRnXW2j6+aDy+97enTqsSZ6f7VA
-91u/98NDnQu2cP7ElX6vF68tXxt6Dbh863+aQTT80GPQUUVn1wKa+gYHQkJRMXRW
-6Bx4TwIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1UdDgQWBBTW
-iGpee2+D07MdCJxmYHi8rd+MMzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCBqoAUaDnf
-yYHAP1GVvNejsZZCOOcYSyShfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD
-QTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4G
-A1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb22C
-FHAEyPzePSbGcgLskvIH1ugaaXQTMA0GCSqGSIb3DQEBCwUAA4IBAQASfIT18qKu
-m0xX10EBuHCM+hChuPAo1iJyP2PZWj4SU79uvMOlyqXSDDIkkFAUPRUj2UHSjWzw
-clnrc1vut//9Lu3GcsQ2bqxllXmFDYqtrUXYQ6zFOpDdIwSUhFBPjggOEVio4PW5
-YWD4LH6sZc7FCSZm8m3UXSiedif5Kn/wcTgLpiiC1llRXwoSuU4Q5lix7T0kK0OY
-hK3ZOvbyVZSWievFKI8IXf/r7fr5MNDLNPxg9U681b+eU5rCg6cE3lqHlSb6vJK+
-UGPn0J6HzUJX5zfnjqCMjahxcNzCPRWkLVtXMo/P92206oiaZfpstPBAwtLHlwxO
-CAdu0OE3C7sB
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBMwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMThaGA8y
-MTIxMDYxNTE5MTIxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmNjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmNjYUBwYXJ0bmVyYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+31Xz+vdtagGGF4Zs
-JPzLNkPRWUZ2aB2nB6O3GFFItRERIeKQQ809jpuWb+3nPwmHgAeu/5KDuHExXUp3
-zsq/pBhjmIxysN/tSB0ZWgnDZj0T/O1cFxmFPSIQi2YqN9ex/k1P0A/bPLYid6sp
-BrMB2oDuemjG9OL8zwWxTWFstwMZgh+PUoLv4xPt3vnv8hiBvMxIRe2IjseFRvR9
-zoaxAW94oeLPngPgWanUZvU+hL0BR2h0RZbsmPciw4K7PzHKCfOnDcJN3/k32GuQ
-1ETYXVqBZstMwZ/yUAZzHDUFuungfM/VyuVVqjV1Njmi1ulrZNaLj3pe+x0WwrXq
-VbgfAgMBAAGjZjBkMB0GA1UdDgQWBBRoOd/JgcA/UZW816OxlkI45xhLJDAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAbIUXWJ1SU2cwnGfJ
-gor9Y3QX8q3bLRBQ6nuVXUhyHtOKnecEYY+6cvTgAy4tcaEbTrmXnIwwddzWXR5c
-IEgpem6t9tJqjvDZ3SMmlIf57L/rKp1rQQXmOBm2fBy86zC6RChYMshf9LQ3pCeZ
-kESZ+WzHqmTDe2vpe3AaZTsGy+HucyVv5Ha5WLATFMPSMbY76sMbFDEr8viskCNm
-JzDvYbqHMfZUJu4eiWiRJ8v6GY1HJ8SJrFUz2ry6WNYiizoEABHC8VrWV+Kss1Vq
-MiFfAZND4wBS5TZmaKi4BQt/+cnUAX0ej6wYSug/+Atz9DSu/b+AsEZ5tXnxDMGO
-vqwj8g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem
@ -1,27 +0,0 @@
-----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
-MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
-QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
-FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
-AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
-p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
-3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
-4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
-0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
-Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
-dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
-YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
-AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
-XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
-KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
-s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
-EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
-mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
-hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
-ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg
@ -1,6 +1,5 @@
-
-name = NSScrypto-miner4
+name = NSScrypto-partner1-miner4
 nssSecmodDirectory = ./src/test/resources/pki-certs/miner4/nssdb
 nssDbMode = readOnly
 nssModule = keystore
-    
+showInfo = true
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert8.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert8.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert9.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert9.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key3.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key3.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key4.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key4.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/pkcs11.txt
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/pkcs11.txt
@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner4/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl-ca.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl-ca.pem
@ -1,70 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBQwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMjRaGA8y
-MTIxMDYxNTE5MTIyNFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmRjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmRjYUBwYXJ0bmVyZC5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbWjqued8UEhetS67V
-pNCkbCBjdeSXyjZgEIxMqmPILY6oymkClkty1ktxMYkEKcDi44+oCq93MIQOAkHx
-qRGlu+z9Eql/aEJzVu85gIfa+64/GJ5OgGIqfI0XOaETu1MGhZN3P7Kb38tmqX7l
-ppP/lfADvdlA/C+SY21Y2OMmeXo8VUtrW5YcUZ2OHt6esFZHCanI7FGYi7A71l/R
-3ZXX1BVvHYJlssY5GwBLT3Yng6sshMihhXviU4f+RBEUm1pSRG/P+0RSjQVyp3bW
-EiwXHu0WD9j7Kjgesrz7J2mFTgjNEQQ6lQioN6ZCrboM6WbxWM2zzSWCPSV/ON1W
-QUVTAgMBAAGjZjBkMB0GA1UdDgQWBBRdtro7rYf1BatcNzBHlkpYj4sW7jAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAJd86d928wxKO8C6+
-VksOT7G2RcYNk9ok90bcAJdj6zAhEM4h5XZPomHYibKvdmGD1IH2TlzX+P4+Z2tc
-mHOkpHCa99vwGlIeb+objfR5fYrZDPlFMfYdzeesXhlmZ5j9bzxMUEAMGVCZOm99
-Gq+uHoj1+bPaLkyaFfETchhlXw6EYXoM5bkdXGZMnXvL3DWWvPauA53tUiRh++Q7
-bPCSbmT9YooVbjqyT2IGzIWXzU0O6u5H4PHMNs+DCiGcoTqvC9uZDcU0l+4g6UV7
-v83YnAhDr+Ed/WJ8EpfvbxmNFu5d/SCmmzJnv2sBn27//q4xUNxV9OaNkbxzVOwd
-cQyzwQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem
@ -1,126 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/uBBtBii2Cw/H
-3pAfiIqIr6jXuYMfcFoBn3S2PXPJtzFkLC/DVNu7VGOJhfwKB34ihNraEIrU1zJN
-WVenfliVtXTQdrDOm62ddkFqZij3j0cLKsACUHMZ5zh3YJB3edgOMO/jHT8IU+6L
-CysPWQS/z8GnMD7JPY/urZOE2Ak64a3NU5Nu0nfRCy23l55Q4uD8XPEyBSbwJ/Js
-Pu4+yFzsPwvAQCEwQwTAm0/nbFzlSAiXf4kq/MpYvUeMi0QRfyCd/2xqjKA50Kiz
-xAAzWHZcObezP67TMrD2G8u1cYFnVSgxemnzsgsqod2ml8bcx8mLOmJjYjGuW7Bi
-7zGc+06JAgMBAAECggEBAII9X2NBAN0STKkhp9TUJBBRDKloDAyKfYqGsXmv633H
-5lS/s77FYfQzkt7011BU4LpAeJAVFssaWcC0Bdjx+unQ+Ec5qkjg9yN2F2BZgFEU
-01VhuEiaMGcTbYejYODZNA4H7p7h2lUk93Mbpifp+FD5qPuTycNZ//JLlmBzhmmp
-gKDd2MIpyyJAAueKM+1J6Wy/dHGwDH3hCf4orb3abZdUoXkFa5K2R0Eio7H2DwtP
-r48rerH58FWkp8761rivua3UNBr8I9KgNNmNqu5UQdnd1ZfxXinq4jGJYgvG4pSz
-i4Wu3qfPVsjZSra+VI5OJXg0giNpU8UpwvOV9Uej55ECgYEA/GfBF0fhjdsx52JS
-4P2nvACr3RV6A+39LLVumbjixQUSeH4duX5lLSvg57sLP4kh19/T8PYM2dijayDt
-SN+mLYA8JUARUecryDTO4Cmyzc819TMh30/RMvCMui61XZZWHiumsfv1KYRq1Ei1
-c0SgPPgMmiGxObKytJ2TSb7K+A0CgYEAwnMNrtPgtVu0gIJmgF2TjcfWihFxZ29d
-NQdxili8EEnVPnDQdP/vvJIFPVlUSrzSQz1GBpDU5pV5Y/gvnCAYJxIo59KRKcVU
-XIJ2TFqLSw23EufDG6SQecUdPfHjarBOZRpbva3t+9zl4GK2wxi3goKeYmfXKl/C
-rJt8wb3JNW0CgYA5Y4nWtkRFkcId/xAjEelyaKCrCvgMLq9y2+nCz/PXohiaBurR
-QzjT9XcUmUWsc4ybXcv9rKQtYAGAGSN6f0d0bwS933xQqAQfaEplU3XRL7zv/GlG
-Mgq5z1Hf/0DDf6wi/f/P1h7fCrmTfNis1bytQCT1YpW+LbBOOsnDabsSfQKBgDSX
-5fWJfVfQTAwOOSczKDvK9240tZWie3ViZAVlZsiJD9JptRhQOUmpvR0Q0km8tKpX
-Il+YQN11RHYTpNz3mVDICqRZQcYoh17WMqUIQHC2bvQAF7ecVS96byRYDojG0w1p
-ibLOHnZnEw4T5Rbz0n7MUYaQS5Q8fm0tSRsl+AwpAoGBAPAvllQ8IcjsfR01Gskr
-/3KECDQwzgpdn1jCRxnzsKll8cnLsRxXKo2oYTdnbV9k+j6qT0Xy0QoHbOGuOmnF
-JVHMvCXVhs9/qyGyOfZ8iQh7101FnOj+nW7/WaB/y3lFoyDMdYIW4SXYYuSO3EVs
-gPq2+rIrwGY3e+ZkbnFEn6UF
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIIEtTCCA52gAwIBAgIUBBRpdaDIsULA/tPnSkiiUQ2MPqkwDQYJKoZIhvcNAQEL
-BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
-CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmRjYTEm
-MCQGCSqGSIb3DQEJARYXcGFydG5lcmRjYUBwYXJ0bmVyZC5jb20wIBcNMjEwNzA5
-MTkxMjI4WhgPMjEyMTA2MTUxOTEyMjhaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEP
-MA0GA1UEAwwGbWluZXI0MSIwIAYJKoZIhvcNAQkBFhNtaW5lcjRAcGFydG5lcmQu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7gQbQYotgsPx96Q
-H4iKiK+o17mDH3BaAZ90tj1zybcxZCwvw1Tbu1RjiYX8Cgd+IoTa2hCK1NcyTVlX
-p35YlbV00HawzputnXZBamYo949HCyrAAlBzGec4d2CQd3nYDjDv4x0/CFPuiwsr
-D1kEv8/BpzA+yT2P7q2ThNgJOuGtzVOTbtJ30Qstt5eeUOLg/FzxMgUm8CfybD7u
-Pshc7D8LwEAhMEMEwJtP52xc5UgIl3+JKvzKWL1HjItEEX8gnf9saoygOdCos8QA
-M1h2XDm3sz+u0zKw9hvLtXGBZ1UoMXpp87ILKqHdppfG3MfJizpiY2IxrluwYu8x
-nPtOiQIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1UdDgQWBBSr
-HBcQihDF8M8jcSRDoAkAXD56oDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCBqoAUXba6
-O62H9QWrXDcwR5ZKWI+LFu6hfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD
-QTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4G
-A1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb22C
-FHAEyPzePSbGcgLskvIH1ugaaXQUMA0GCSqGSIb3DQEBCwUAA4IBAQCUGfPiIReS
-RQmlmOW6DGOCd16gE+b5WVwhbH/jwUmQM3IZ/cKdiQuclekZlxuDRVmVAIhExfIq
-fXe8KGVvEbLkcOWmLKcpm37o//7kv6IMyEmL6UnCmmwuA8m9rrWHA/HJ0Nz4tYVv
-fLYRi3Tvc8xik7oUAeaTob6ZewJQvrDUero4I4GDD04aFcoqxy66Yyk2CgR99olB
-dXmdshWbVsG5WszX510LggTk8UoDLwqU7t7qMDI/XaIduu8oZtoGxawToaM2URBN
-72iNJqoB2kkHVGc0Bf5Vy2qh+b+TOH+zGut3u94az9fGT3AdQ9i7sMcJYwKaW/AD
-DCccjQz6QUJE
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBQwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMjRaGA8y
-MTIxMDYxNTE5MTIyNFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmRjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmRjYUBwYXJ0bmVyZC5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbWjqued8UEhetS67V
-pNCkbCBjdeSXyjZgEIxMqmPILY6oymkClkty1ktxMYkEKcDi44+oCq93MIQOAkHx
-qRGlu+z9Eql/aEJzVu85gIfa+64/GJ5OgGIqfI0XOaETu1MGhZN3P7Kb38tmqX7l
-ppP/lfADvdlA/C+SY21Y2OMmeXo8VUtrW5YcUZ2OHt6esFZHCanI7FGYi7A71l/R
-3ZXX1BVvHYJlssY5GwBLT3Yng6sshMihhXviU4f+RBEUm1pSRG/P+0RSjQVyp3bW
-EiwXHu0WD9j7Kjgesrz7J2mFTgjNEQQ6lQioN6ZCrboM6WbxWM2zzSWCPSV/ON1W
-QUVTAgMBAAGjZjBkMB0GA1UdDgQWBBRdtro7rYf1BatcNzBHlkpYj4sW7jAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAJd86d928wxKO8C6+
-VksOT7G2RcYNk9ok90bcAJdj6zAhEM4h5XZPomHYibKvdmGD1IH2TlzX+P4+Z2tc
-mHOkpHCa99vwGlIeb+objfR5fYrZDPlFMfYdzeesXhlmZ5j9bzxMUEAMGVCZOm99
-Gq+uHoj1+bPaLkyaFfETchhlXw6EYXoM5bkdXGZMnXvL3DWWvPauA53tUiRh++Q7
-bPCSbmT9YooVbjqyT2IGzIWXzU0O6u5H4PHMNs+DCiGcoTqvC9uZDcU0l+4g6UV7
-v83YnAhDr+Ed/WJ8EpfvbxmNFu5d/SCmmzJnv2sBn27//q4xUNxV9OaNkbxzVOwd
-cQyzwQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem
@ -1,27 +0,0 @@
-----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
-MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
-QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
-FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
-AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
-p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
-3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
-4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
-0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
-Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
-dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
-YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
-AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
-XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
-KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
-s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
-EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
-mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
-hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
-ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg
@ -1,6 +1,5 @@
-
-name = NSScrypto-miner5
+name = NSScrypto-partner1-miner5
 nssSecmodDirectory = ./src/test/resources/pki-certs/miner5/nssdb
 nssDbMode = readOnly
 nssModule = keystore
-    
+showInfo = true
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert8.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert8.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert9.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert9.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key3.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key3.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key4.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key4.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/pkcs11.txt
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/pkcs11.txt
@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner5/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl-ca.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl-ca.pem
@ -1,70 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
-MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
-B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
-6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
-rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
-cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
-plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
-ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
-/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
-WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
-qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
-cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
-+6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
-NaI0qQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem
@ -1,126 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDWh2OR86WTMOGM
-024S29O/c/TlYPN4+Jgi0FjGTUn3u2URKnCEuoTy1A6JSsU6ZL3oUR/Igi2Wu28/
-nByBbYzWETxP6aO3iu3fCbOE/J/v6Abkt47byVAIacyA4xuyzOt4wZX3zlvxadsN
-UxhG3xs2lnS/uNjbeJIbHtGM7oXzg9tOa5JndJursFPDuvXidXFLrmbHNZiOX5ts
-p+odbDn76wW6zdWwhzh2tzxFFBMDX4xuxfySyUM7UdP5xdzQvASlgiDen49KV8bD
-ZVPiQvr/lbfaDAdHt7SMRRr+dypDBtFldoSZEwXAlMkFMnsVbvqu+fPXr4ly/SPD
-OJe79tC7AgMBAAECggEBAIEGPKRzXYoBRCZmozVEcT4ch5XNkaGYIigOFtZtdadB
-Va/VTocFhyBk2blI9wX/wRgQcoUthi253VbslVhiguncw+FsK8MgE6CpPQcmySqI
-6lx06b7WfQQSXaTG8sm+5YBjLcc0nae8erqw11EIrl1OcDk++25EPduB1ZZlfrrN
-4MKVAbuvGhEDYPDJb5qR276o6iUvXXG3Xc4qMcLHBjyB6GwnssOVGEH6eOkggwtL
-XCgWOBAdnjRXbGYx4CLCqp0Ii7Vlzu5V8061C6GGD/mo2InbhC+GP6bVp0wKfOT1
-zyhxitPO1XyLhS443QhpI2etf/+6K5cmbQU9cGUSgEECgYEA9kjLdeGu7bAXmtU5
-ygkMj/aZhli6Z6MExJvZyz/DPNg7drAkpqxKOaMGgz3pJt0jsbnCfZXZQz9SxxxT
-EvHCXidSVIqvNXTp8Jtn5qSLL5jdYNPn2xZXhpR/r9H5ZaNvpcJdJKZ5/vGMKxob
-whbgCIVuvSRJgEdvSGc7fmTSY4UCgYEA3v3l6m4S2k1/+jdwYtjuvIrUFD8jGqyO
-v7XJZI/ffJ9zQThiNxnNT7uDCEseyfzil9BhYl6ifRaCtWHZoB4+GM3ESn8omA2d
-1esKTBnNthmbskw1BRmqsYvESaZFSHIpQFP2LXYKzrk0WtQVdFlKO13cOB8liJ2x
-rmQuoYHv9z8CgYAk1tCwSljLLvro6xog0WeypRVj1iPT2ruc2R8j2t7OXB3Q7Bof
-YEgeBPe1a+5TJOLw87NW67I6797m76Kxg74qLUGQaco5ecqAdg59noE/VmNO14On
-7tiaxd2vo/3lKSRLLB6Ym9pFu0XXMKmUR62tOKBO5H2mFYlc0CxDBLu/rQKBgQCj
-G3JOLJ+LoH6Ixn5lPyo5LQ79lEUYILn1joG2Feqx3GvQe+6TQUNFG/I3YcMumdQg
-maJx8qjF+G45QE6P6S8gs3ntx98ogWU+8MJCcelfVpHlNArgJSsO3R4BhSZOXHrB
-++gozpwPI7cg7NqYlStQC1Kmllm8+SPbXJojNskQvwKBgQC4SayNdtAKEs8sZtAp
-YaNA489DWkwvk7S5zmz7WBmPhY+98DZGVgQ0igdb8qGGJypObkeWOiWWM1a/PeNT
-WJ7up71h97O9D5wAfRY2g5in99Z8nZDUmqS39MMRNDhfFWLBJclKxK/xu+e1iNgv
-dp8OLfXXYzIuBX5pH+F1XGWV2A==
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIIEtTCCA52gAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zkwDQYJKoZIhvcNAQEL
-BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
-CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
-MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
-MTkxMjMwWhgPMjEyMTA2MTUxOTEyMzBaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEP
-MA0GA1UEAwwGbWluZXI1MSIwIAYJKoZIhvcNAQkBFhNtaW5lcjVAcGFydG5lcmEu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1odjkfOlkzDhjNNu
-EtvTv3P05WDzePiYItBYxk1J97tlESpwhLqE8tQOiUrFOmS96FEfyIItlrtvP5wc
-gW2M1hE8T+mjt4rt3wmzhPyf7+gG5LeO28lQCGnMgOMbsszreMGV985b8WnbDVMY
-Rt8bNpZ0v7jY23iSGx7RjO6F84PbTmuSZ3Sbq7BTw7r14nVxS65mxzWYjl+bbKfq
-HWw5++sFus3VsIc4drc8RRQTA1+MbsX8kslDO1HT+cXc0LwEpYIg3p+PSlfGw2VT
-4kL6/5W32gwHR7e0jEUa/ncqQwbRZXaEmRMFwJTJBTJ7FW76rvnz16+Jcv0jwziX
-u/bQuwIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1UdDgQWBBSf
-AWzkIujGsboW/hJBDLAnhHZIsDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCBqoAUIaZG
-YPiraoerBQo7ZvRxPvWyyd2hfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD
-QTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4G
-A1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb22C
-FHAEyPzePSbGcgLskvIH1ugaaXQRMA0GCSqGSIb3DQEBCwUAA4IBAQCvV9HbQ2er
-lxqaWFmbQJJMlT7oXbstRj3mOx0g8NdwVKKpFNNAzhYbFDj70NEEwXfRO/me5LCV
-G6FeUXG7PIUutsR/+blTBj0+lLMotDwRnkY8pM4i3lLl+AFEGfw8snSBYoBW4zPy
-w4eipifsGwRT+7V20NMxNovs7aJFHuLj2ThsAaRxlw1jdGbKDGxiUatd0+qlg6q7
-TEajmpNAXgZLaqoGL/isqXWJzcQWgE87x9Sla6n8d53zfpHqojGC8GZJ8umkjqYt
-v/hV47BeY6Y+r3CJqCLi3ITz86KaMyxgoiq7zXg2mHoY4k0TQWhrN7zl7T6SGwMG
-KTC5vax4Ej1h
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
-KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
-MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
-A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
-cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
-B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
-6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
-rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
-cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
-plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
-ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
-HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
-/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
-WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
-qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
-cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
-+6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
-NaI0qQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
-AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
-4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
-7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
-jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
-m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
-Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
-AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
-gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
-TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
-8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
-c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
-xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
-Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
-BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
-BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
-HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
-WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
-MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
-AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
-Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
-fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
-kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
-PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
-XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
-uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
-BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
-OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
-oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
-JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
-9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
-h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
-----END CERTIFICATE-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem
@ -1,27 +0,0 @@
-----BEGIN X509 CRL-----
-MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
-MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
-QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
-FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
-AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
-p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
-3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
-4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
-0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
-Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
-dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
-YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
-AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
-XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
-KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
-s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
-EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
-mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
-hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
-ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
-----END X509 CRL-----
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg
@ -1,6 +1,5 @@
-
-name = NSScrypto-miner6
+name = NSScrypto-partner2-miner6
 nssSecmodDirectory = ./src/test/resources/pki-certs/miner6/nssdb
 nssDbMode = readOnly
 nssModule = keystore
-    
+showInfo = true
--- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert8.db
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert8.db
--- a/Show More
+++ b/Show More